Shea Levy fde3526e7d Merge branch 'master' into stdenv-updates ... Conflict in kerberos, which was updated both in master and in stdenv-updates. Kept the stdenv-updates version, except pulled in the enableParallelBuilding change from master. Signed-off-by: Shea Levy <shea@shealevy.com> Conflicts: pkgs/development/libraries/kerberos/krb5.nix		2013-05-04 18:28:48 -04:00
..
audio	Distrho: fix build: pin premake to version 3	2013-04-22 23:40:06 +02:00
display-managers	lightdm: Add lightdm and lightdm-gtk-greeter	2013-03-29 15:37:28 +01:00
editors	magit: fix download url	2013-04-22 21:44:04 +02:00
graphics	openscad: compile the correct version number	2013-04-25 08:41:46 +02:00
misc	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
networking	Merge pull request #482 from coroa/notmuch-gpg2	2013-05-03 11:34:29 -07:00
office	haskell-hledger-interest: update to version 1.4.3	2013-05-03 11:38:52 +02:00
science	Update E prover	2013-04-21 16:30:40 +04:00
search	Adding doodle.	2013-04-22 20:57:14 +04:00
taxes	aangifte2012: preload library which seems needed	2013-04-05 00:34:14 +02:00
version-management	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
video	mkvtoolnix: upgrade to 6.2.0	2013-04-30 09:27:02 +02:00
virtualization	virtualbox+guest: Update to new upstream v4.2.12.	2013-04-13 10:31:36 +02:00
window-managers	dwm: adding a patch I missed in a recent commit	2013-04-05 12:50:42 +02:00