William A. Kennington III 36614ff3e2 Revert "Revert "Merge pull request #2449 from wkennington/master.grub"" ... This reverts commit 94205f5f21. Conflicts: nixos/modules/system/boot/loader/grub/install-grub.pl		2014-09-02 09:16:13 -07:00
..
applications	zile: update from 2.4.9 to 2.4.11, adpot it and set platforms to linux	2014-09-02 17:57:09 +02:00
build-support	Revert "Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS"	2014-09-02 20:17:55 +04:00
data	miscfiles: update from 1.4.2 to 1.5 and adopt it	2014-09-01 23:59:07 +02:00
desktops	Merge branch 'gnome3'	2014-09-02 12:59:47 +02:00
development	Merge pull request #3927 from ts468/haste	2014-09-02 17:27:44 +02:00
games	hawkthorne: Initial commit, license issue still unresolved	2014-08-31 20:08:15 +01:00
misc	Add auto-updater for XScreensaver	2014-09-02 14:25:17 +04:00
os-specific	Don't specify Perl version	2014-09-02 03:04:17 +04:00
servers	Merge pull request #3704 from sfultong/upstream-master	2014-09-02 02:09:18 +04:00
shells	pythonPackges.ipython: 2.0.0 -> 2.2.0	2014-08-25 11:01:31 +02:00
stdenv	Merge pull request #2455 from bjornfor/helpful-messages-when-refusing-eval	2014-08-12 20:18:10 +02:00
test
tools	Revert "Revert "Merge pull request #2449 from wkennington/master.grub""	2014-09-02 09:16:13 -07:00
top-level	Revert "Revert "Merge pull request #2449 from wkennington/master.grub""	2014-09-02 09:16:13 -07:00