Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
apps	gtksourceview 3.12: hard code data dirs to nix store path	2014-07-13 16:32:41 +02:00
core	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
desktop/rarian	Branch gnome 3.12	2014-05-20 13:41:33 +02:00
devtools	added meta information	2014-07-31 00:49:14 +02:00
misc	added meta information	2014-07-31 00:49:14 +02:00
default.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00