Vladimír Čunát 694fa543af Merge 'staging' ... Conflicts: pkgs/servers/x11/xorg/default.nix		2014-08-24 10:50:22 +02:00
..
applications	Merge 'staging'	2014-08-24 10:50:22 +02:00
build-support	Merge 'staging'	2014-08-24 10:50:22 +02:00
data	man-pages: Update to 3.70	2014-08-19 11:46:08 +02:00
desktops	Merge 'staging'	2014-08-24 10:50:22 +02:00
development	Merge 'staging'	2014-08-24 10:50:22 +02:00
games	update minecraft-server to 1.7.10	2014-08-18 18:51:51 -07:00
misc	Vim-plugins: add vim-pathogen	2014-08-15 19:45:32 +02:00
os-specific	Merge 'staging'	2014-08-24 10:50:22 +02:00
servers	Merge 'staging'	2014-08-24 10:50:22 +02:00
shells	Merge 'staging' into master	2014-08-08 20:13:23 +02:00
stdenv	Merge remote-tracking branch 'origin/staging' into modular-stdenv	2014-08-22 00:07:05 +02:00
test
tools	Merge 'staging'	2014-08-24 10:50:22 +02:00
top-level	Merge 'staging'	2014-08-24 10:50:22 +02:00