nixpkgs/pkgs
Vladimír Čunát ec736312d4 Merge branch 'master' into x-updates
Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)
2013-04-17 18:26:28 +02:00
..
applications Merge branch 'master' into x-updates 2013-04-17 18:26:28 +02:00
build-support gcc-wrapper: avoiding one glibc rebuild, for gcc.crossDrv 2013-04-10 18:26:42 +02:00
data Merge branch 'master' into x-updates 2013-04-04 21:43:40 +02:00
desktops non-linux attempts to fix: libbonobo and libjpeg 2013-04-14 14:06:10 +02:00
development Merge branch 'master' into x-updates 2013-04-17 18:26:28 +02:00
games Merge branch 'master' into x-updates 2013-04-13 12:21:31 +02:00
lib Merge branch 'master' into x-updates 2013-04-17 18:26:28 +02:00
misc cups: fix reference to dbus.libs 2013-04-11 16:02:24 +02:00
os-specific Merge branch 'master' into x-updates 2013-04-17 18:26:28 +02:00
servers silc-server: Nicer fetchurl src. 2013-04-12 21:39:07 +02:00
shells bash-completion: update to version 2.1 2013-04-10 17:39:09 +02:00
stdenv Remove the "proprietary" license 2013-04-12 14:37:50 +02:00
test
tools Merge branch 'master' into x-updates 2013-04-17 18:26:28 +02:00
top-level Merge branch 'master' into x-updates 2013-04-17 18:26:28 +02:00