Peter Simons 0823aea0a6 Merge branch 'master' into stdenv-updates. ... Conflicts: pkgs/development/libraries/libxslt/default.nix Commit 1764ea2b0a introduced changes to libxslt in an awkward way to avoid re-builds on Linux. This patch has been simplified during this merge.		2013-03-25 13:43:45 +01:00
..
applications	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
build-support	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
data	Adding the sgml dtd for docbook 3.1	2013-03-18 15:07:20 +01:00
desktops	A more complete fix of cyrus-sasl update (broken KDEs).	2013-03-13 21:06:37 +01:00
development	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
games	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
lib	pkgs/lib/licenses.nix: strip trailing whitespace	2013-03-24 22:45:48 +01:00
misc	Merge remote-tracking branch 'origin/master' into stdenv-updates	2013-03-07 19:33:52 +01:00
os-specific	htop: update to version 1.0.2	2013-03-25 00:01:56 +01:00
servers	mongodb: upgrade to 2.4.0	2013-03-25 08:08:46 +01:00
shells	ipython: adding depenencies for ipython's notebook	2013-03-23 00:38:18 +01:00
stdenv	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
test
tools	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
top-level	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00