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
..
arduino
compilers	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-03-21 16:26:34 +01:00
libraries	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
misc
mobile	androidenv: fix error with obsolete quotation	2013-03-21 14:21:20 +01:00
ocaml-modules
perl-modules
python-modules	dbus-python: update the ancient version	2013-03-15 01:09:57 +01:00
qtcreator
ruby-modules
tools	Merge branch 'master' into stdenv-updates.	2013-03-25 13:43:45 +01:00
web	Implemented an unelegant workaround that allows nodejs to be used on darwin using xcode	2013-03-14 13:52:45 +01:00