Eelco Dolstra 585983bc95 Merge remote-tracking branch 'origin/staging' ... Conflicts: pkgs/applications/version-management/subversion/default.nix		2014-09-08 11:42:09 +02:00
..
apps	evolution: fix build	2014-09-05 12:46:16 +02:00
core	Merge recent master into staging	2014-09-06 16:52:45 +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	Merge recent master into staging	2014-09-06 16:52:45 +02:00
default.nix	gpaste: new package	2014-08-14 21:16:42 +02:00