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

..

applications

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00

build-support

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00

data

man-pages: Update to 3.50

2013-03-27 23:00:02 +01:00

desktops

xfce4notifyd: bugfix update, check now, minor fixes

2013-04-21 13:08:11 +02:00

development

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00

games

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00

lib

overrideDerivation: Re-attatch passthru and meta to all outputs

2013-05-03 09:12:55 -04:00

misc

Merge branch of 'hatari'

2013-04-23 11:06:17 +04:00

os-specific

Merge pull request #381 from ierton/bluez5

2013-05-03 10:54:39 -07:00

servers

jboss: Update to 7.1.1.Final

2013-05-01 11:22:37 -04:00

shells

bash-completion: update to version 2.1

2013-04-10 17:39:09 +02:00

stdenv

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00

test

…

tools

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00

top-level

Merge branch 'master' into stdenv-updates

2013-05-04 18:28:48 -04:00