Jonathan Glines c977673bb5 Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen ... Conflicts: pkgs/tools/X11/nitrogen/default.nix		2014-06-13 11:41:40 -06:00
..
admin
archivers	Updating ZPAQ to 651	2014-05-28 01:33:29 +04:00
audio
backup
bluetooth
cd-dvd
compression
filesystems	btrfsProgs: Update 3.14 -> 3.14.2 (close #2797)	2014-05-31 14:42:17 +02:00
graphics	Updating Asymptote to 2.32	2014-05-28 01:33:29 +04:00
inputmethods/fcitx
misc	debootstrap: update from 1.0.42 to 1.0.60	2014-05-27 21:30:59 +02:00
networking	offlineimap: update to 6.5.6	2014-06-01 14:40:57 +01:00
package-management
security	fix getopt path on darwin	2014-05-29 09:46:53 -07:00
system	monit: bump 5.8 -> 5.8.1 (bug fixes)	2014-05-25 19:27:10 +02:00
text	dos2unix: update from 6.0.4 to 6.0.5	2014-05-27 21:33:07 +02:00
typesetting	texlive: add note to clarify why dvisvgm fails to work on darwin	2014-06-02 22:58:16 +00:00
video
virtualization
X11	Merge branch 'nitrogen' of github.com:/auntieNeo/nixpkgs into nitrogen	2014-06-13 11:41:40 -06:00