Eelco Dolstra f33fa1b66b Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/boost/generic.nix		2014-11-11 23:48:08 +01:00
..
apps	New version of gnome-shell-pomodoro	2014-10-26 14:07:26 +01:00
core	Fixed many descriptions	2014-11-11 14:36:34 +01:00
desktop/rarian
devtools	added meta information	2014-07-31 00:49:14 +02:00
misc	gpaste 3.12.3 -> 3.12.3.1	2014-10-10 12:55:56 +02:00
default.nix	Merge remote-tracking branch 'origin/master' into staging.	2014-10-31 11:14:24 +01:00