Jonathan Glines 2784866ffd Merge branch 'master' into nitrogen. Added maintainer and license. ... Conflicts: pkgs/tools/X11/nitrogen/default.nix		2014-06-13 11:54:19 -06:00
..
admin
archivers	Update ZPAQ	2014-06-10 09:41:23 +04:00
audio	mpdcron: add expression	2014-05-23 08:39:28 +10:00
backup	ori: enable orilocal	2014-05-15 23:00:18 +02:00
bluetooth
cd-dvd	unetbootin: update 585 -> 603	2014-05-20 09:16:06 +02:00
compression
filesystems	Remove illegal meta.src attributes	2014-06-05 13:04:18 +02:00
graphics	fix licenCe typos	2014-06-12 09:12:14 +02:00
inputmethods/fcitx
misc	fix licenCe typos	2014-06-12 09:12:14 +02:00
networking	tinc: Update from 1.0.23 to 1.0.24	2014-06-09 15:14:05 +02:00
package-management	nix-prefetch-scripts: new expression	2014-06-10 19:26:20 +02:00
security	Update tor to 0.2.4.22 and tor browser to 3.6.2	2014-06-13 14:21:53 +12:00
system	ansible: add boto as dependency for s3 module	2014-05-26 10:29:17 +02:00
text	dos2unix: update from 6.0.4 to 6.0.5	2014-05-27 21:33:07 +02:00
typesetting	texlive: add potrace dependency without qualification	2014-06-10 08:57:52 +00:00
video
virtualization
X11	Merge branch 'master' into nitrogen. Added maintainer and license.	2014-06-13 11:54:19 -06:00