Vladimír Čunát 4c5a71f777 Merge master into x-updates ... Conflicts: pkgs/desktops/gnome-2/desktop/gvfs/default.nix pkgs/development/libraries/cogl/default.nix pkgs/development/libraries/libsoup/2.44.nix		2013-12-18 23:21:29 +01:00
..
applications	Merge master into x-updates	2013-12-18 23:21:29 +01:00
build-support	pkgs/build-support/cabal: configure a proper library rpath for dynamically linked executables	2013-12-16 21:11:29 +01:00
data	lmodern: update from 2.004.1 to 2.004.4	2013-12-18 18:18:37 +02:00
desktops	Merge master into x-updates	2013-12-18 23:21:29 +01:00
development	Merge master into x-updates	2013-12-18 23:21:29 +01:00
games	gemrb: update from 0.6.1 to 0.8.0.1	2013-12-18 18:18:28 +02:00
misc	Merge master into x-updates	2013-12-18 23:21:29 +01:00
os-specific	Linux 3.12.5	2013-12-18 12:35:07 -05:00
servers	Merge master into x-updates	2013-12-18 23:21:29 +01:00
shells	dash: update from 0.5.6 to 0.5.7	2013-12-18 18:18:24 +02:00
stdenv	mkDerivation: Set meta.position to the source file of the derivation	2013-11-19 14:58:47 +01:00
test
tools	Merge master into x-updates	2013-12-18 23:21:29 +01:00
top-level	Merge master into x-updates	2013-12-18 23:21:29 +01:00