Aristid Breitkreuz 08bf164c55 Merge branch 'master' of github.com:wyvie/nixpkgs into wyvie-master		2014-09-14 22:48:18 +02:00
..
audio	Upgraded mpc to v0.26	2014-09-14 05:37:24 +01:00
display-managers
editors	Fixed file name with new version	2014-09-14 21:19:38 +02:00
graphics	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00
inferno	Add missing 's' in remaining meta.maintainer(s) attrs	2014-07-22 23:49:21 +02:00
misc	Merge pull request #4080 from nathanielbaxter/dev/keepass	2014-09-14 16:16:13 +02:00
networking	mailpile: dev -> 0.4.0 (beta release)	2014-09-14 18:28:23 +02:00
office	zim: fixed build; it also runs find now but the solution is hacky	2014-09-04 23:54:14 +02:00
science	R: Revert update to version 3.1.1	2014-09-13 20:03:44 +02:00
search	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
taxes
version-management	git-annex: broken by optparse-applicative 0.10.x	2014-09-14 00:06:45 +02:00
video	Merge pull request #4064 from eduarrrd/xbmc-libmad	2014-09-13 17:13:09 +02:00
virtualization	VirtualBox: Fix ALSA audio.	2014-09-14 11:28:34 +02:00
window-managers	transformed meta.maintainers of some packages into lists	2014-09-13 13:52:02 +02:00