Vladimír Čunát 3ec2cea214 Merge master into x-updates ... Conflicts (auto-solved): pkgs/os-specific/linux/alsa-plugins/default.nix		2014-06-20 00:24:38 +02:00
..
audio	add xmp 4.0.7	2014-06-10 12:07:41 +08:00
display-managers	freetype: major update, including some CVE security	2014-06-17 09:00:29 +02:00
editors	Merge pull request #2977 from bluescreen303/emacs-org2blog	2014-06-18 16:21:02 -05:00
graphics	Adding an auto-updater script for qiv and updating it to 2.3.1	2014-06-13 13:37:12 +04:00
ike	ike: use stdenv.lib.licenses.sleepycat	2014-03-24 19:58:36 -05:00
misc	sweethome3d: remove '.' at end of description	2014-06-15 13:49:55 +02:00
networking	Merge master into x-updates	2014-06-20 00:24:38 +02:00
office	keepnote: update to version 0.7.8	2014-05-18 13:43:21 +02:00
science	haskell-sloane: update to version 1.8	2014-06-13 15:41:25 +02:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	Add aangifte-2013	2014-03-01 16:54:16 +01:00
version-management	add OPENSSL_X509_CERT_FILE to the git command environment	2014-06-16 21:55:43 -04:00
video	xbmc: 13.0 -> 13.1	2014-06-09 20:42:57 +02:00
virtualization	qemu: 1.7.1 -> 2.0.0	2014-05-18 15:52:44 -05:00
window-managers	wayland, weston: update 1.4.0 -> 1.5.0	2014-06-17 09:00:29 +02:00