Peter Simons 1c0d15b90e Merge branch 'origin/master' into staging. ... Conflicts: pkgs/development/libraries/ffmpeg/2.x.nix pkgs/development/libraries/serf/default.nix		2014-09-02 12:31:03 +02:00
..
apps	gtksourceview 3.12: hard code data dirs to nix store path	2014-07-13 16:32:41 +02:00
core	Merge recent master into staging	2014-08-21 15:09:31 +02:00
desktop/rarian
devtools	added meta information	2014-07-31 00:49:14 +02:00
misc	Merge branch 'origin/master' into staging.	2014-09-02 12:31:03 +02:00
default.nix	gpaste: new package	2014-08-14 21:16:42 +02:00