Peter Simons 6694ef42a9 Merge branch 'master' into staging. ... Conflicts: pkgs/development/libraries/gtk+/2.x.nix pkgs/tools/security/gnupg/21.nix pkgs/top-level/all-packages.nix		2015-03-10 12:09:43 +01:00
..
altcoins	updating bitcoin and changing source location	2015-02-22 14:29:34 -05:00
audio	yoshimi: update from 1.3.2 to 1.3.3	2015-03-07 19:01:37 +01:00
backup/crashplan
display-managers	lightdm-gtk-greeter: More fixes	2015-03-09 18:42:53 -07:00
editors	Merge pull request #6697 from ardumont/add-tuxguitar	2015-03-08 11:54:57 +01:00
gis
graphics	Merge branch 'master' into staging.	2015-03-10 12:09:43 +01:00
inferno
kde-apps-14.12	update various packages to use Qt 5.4	2015-02-21 11:39:20 -06:00
misc	Merge pull request #6690 from kirelagin/keybase	2015-03-08 16:06:37 -07:00
networking	syncthing: Update to 0.10.25	2015-03-08 18:22:52 -05:00
office	antiword: apply debians patch for CVE-2014-8123	2015-03-09 18:27:25 +01:00
science	R: update to version 3.1.3	2015-03-09 16:37:05 +01:00
search
taxes	orig-gcc -> orig-cc	2015-03-04 22:15:46 +01:00
version-management	git: 2.3.0 -> 2.3.1	2015-03-05 12:18:06 +01:00
video	Merge pull request #6660 from flosse/zdfmediathk	2015-03-05 23:59:18 +03:00
virtualization	virtualbox: Update to new upstream version 4.3.24.	2015-03-04 15:14:16 +01:00
window-managers	Merge pull request #6686 from blueyed/update-awesome-3.5.6	2015-03-08 16:09:11 -07:00