philipp/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Activity
nixpkgs/pkgs
History
Vladimír Čunát 74488e2b58 Merge branch 'x-updates' into stdenv-updates 
Conflicts (simple):
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/mesa/default.nix
2013-09-02 15:44:57 +02:00
..
applications Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
build-support pkgs/build-support/cabal: unconditionally set $LANG to "en_US.UTF-8" during Haskell builds 2013-08-31 11:00:08 +02:00
data
desktops Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
development Merge branch 'x-updates' into stdenv-updates 2013-09-02 15:44:57 +02:00
games Merge remote-tracking branch 'origin/master' into stdenv-updates. 2013-08-30 10:45:11 +02:00
lib Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
misc Merge branch 'master' into x-updates 2013-08-28 10:37:41 +02:00
os-specific Merge branch 'x-updates' into stdenv-updates 2013-09-02 15:44:57 +02:00
servers Merge branch 'x-updates' into stdenv-updates 2013-09-02 15:44:57 +02:00
shells bash: Update to 4.2-p45 2013-08-26 14:28:56 +02:00
stdenv
test
tools Merge branch 'x-updates' into stdenv-updates 2013-09-02 15:44:57 +02:00
top-level Merge branch 'x-updates' into stdenv-updates 2013-09-02 15:44:57 +02:00