Vladimír Čunát f448cc022b changes proposed for 'release-13.10' into x-updates ... Conflicts (simple, taking whole higher/later versions): pkgs/development/libraries/gtk+/2.x.nix pkgs/development/libraries/mesa/default.nix pkgs/development/libraries/polkit/default.nix		2013-11-05 08:38:15 +01:00
..
applications	calibre: fix hash	2013-11-01 07:59:11 +01:00
build-support	Updating SlimerJS to Git version for compatibility with fresh xulrunner	2013-10-31 02:59:45 +04:00
data
desktops	changes proposed for 'release-13.10' into x-updates	2013-11-05 08:38:15 +01:00
development	changes proposed for 'release-13.10' into x-updates	2013-11-05 08:38:15 +01:00
games	Adding upstream tracker for quantum minigolf	2013-10-29 10:56:54 +04:00
misc	vimPlugins.ipython: add expression	2013-10-29 15:45:46 +02:00
os-specific	grsecurity: Update to 2.9.1-3.2.52-201310271550	2013-10-29 13:32:53 +01:00
servers	Merge branch 'master' into x-updates	2013-11-01 08:35:16 +01:00
shells
stdenv
test
tools	Merge pull request #1139 from offlinehacker/pkgs/pnquant/add	2013-10-30 03:42:52 -07:00
top-level	changes proposed for 'release-13.10' into x-updates	2013-11-05 08:38:15 +01:00