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
..
arch
bazaar	bazaar: Update to 2.5.1	2013-01-15 18:53:12 +01:00
codeville
cvs
cvs2svn
cvsps
darcs	darcs: disable test suite to avoid 127 exit code	2013-02-25 00:37:11 +01:00
fossil	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
git-and-tools	Merge branch 'master' into stdenv-updates	2013-05-04 18:28:48 -04:00
gource
guitone
kdesvn	Rename buildNativeInputs -> nativeBuildInputs	2012-12-28 19:20:09 +01:00
meld	meld: update to 1.6.1	2013-04-08 12:14:26 +02:00
mercurial	python module cleanup, enable a couple of tests, add comments for failing	2012-12-03 06:38:11 +01:00
monotone	monotone: fix	2013-02-24 00:31:20 +01:00
monotone-viz
mr
rapidsvn
rcs	rcs: update to version 5.8.2	2013-04-05 08:56:40 +02:00
subversion	subversion: Update to 1.7.9	2013-05-01 13:15:05 +02:00
tailor
tkcvs
veracity	Update veracity	2012-12-04 10:12:38 +04:00
viewmtn