Domen Kožar 4aa3eec330 Merge branch 'master' into staging ... Conflicts: pkgs/development/libraries/fontconfig/default.nix		2014-12-07 14:02:48 +01:00
..
audio	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
backup/crashplan	crashplan: 3.6.3 -> 3.6.4	2014-11-18 12:40:57 +00:00
display-managers	fix sha for a slim's theme	2014-11-08 22:40:36 +03:00
editors	pycharm: Update to 4.0.1	2014-12-01 18:27:51 +01:00
gis	saga: update from 2.1.2 to 2.1.4 and re-enable build on x86_64-linux	2014-11-18 14:50:01 +01:00
graphics	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
networking	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
office	Just use old glm for LO, the rest of LO is not keen on using C++ git add -A 1	2014-12-05 10:51:40 +03:00
science	R: add meta.platforms attribute	2014-12-03 16:28:28 +01:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	haskell-git-annex: Add maintainer, was removed by mistake.	2014-12-04 21:49:15 +01:00
video	Merge branch 'master' into staging	2014-12-07 14:02:48 +01:00
virtualization	virtualbox: Fix extension pack installation.	2014-12-01 03:32:55 +01:00
window-managers	i3: make i3-save-workspace work	2014-11-30 18:40:03 +01:00