nixpkgs/pkgs/applications/version-management
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 * Get rid of many instances of "args: with args;", and other coding 2010-07-28 11:55:54 +00:00
bazaar bazaar: Update to 2.5.1 2013-01-15 18:53:12 +01:00
codeville * Removed selectVersion. There's no good reason to write 2009-11-18 09:39:59 +00:00
cvs pkgs/applications/version-management/cvs: fixed location of "info" and "man" directories 2010-11-05 14:35:22 +00:00
cvs2svn * makeWrapper: option --run <CMD> to run a command from the wrapper. 2008-01-18 11:28:41 +00:00
cvsps * Cleaned up a lot of description fields that contained newlines. 2009-03-03 13:27:40 +00:00
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 gource: cosmetic, no functional change 2012-01-16 11:33:57 +00:00
guitone Update Guitone 2010-11-02 19:19:25 +00:00
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 Remove a bunch of unreferenced files 2012-11-29 13:43:37 +01:00
mr mr-1.13, more verbose install 2012-08-31 12:07:22 +04:00
rapidsvn Adding rapidsvn 2010-03-10 20:44:40 +00:00
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 Fix tailor URL 2012-04-12 20:54:39 +00:00
tkcvs Updating tkcvs (which includes tkdiff) 2010-03-15 14:26:47 +00:00
veracity Update veracity 2012-12-04 10:12:38 +04:00
viewmtn * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless 2012-01-18 20:16:00 +00:00