philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. 
Conflicts:
	pkgs/development/libraries/ffmpeg/2.x.nix
	pkgs/development/libraries/serf/default.nix
2014-09-02 12:31:03 +02:00
..
applications Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
build-support Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
data miscfiles: update from 1.4.2 to 1.5 and adopt it 2014-09-01 23:59:07 +02:00
desktops Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
development Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
games hawkthorne: Initial commit, license issue still unresolved 2014-08-31 20:08:15 +01:00
misc Add auto-updater for XScreensaver 2014-09-02 14:25:17 +04:00
os-specific Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
servers Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
shells
stdenv
test
tools Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00
top-level Merge branch 'origin/master' into staging. 2014-09-02 12:31:03 +02:00