Vladimír Čunát b1eeae8cac Merge branch 'master' into x-updates ... Conflicts (easy): pkgs/desktops/xfce/core/xfdesktop.nix pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/pango/default.nix		2013-03-17 11:28:28 +01:00
..
arduino
compilers	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
eclipse
guile-modules
interpreters	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
libraries	Merge branch 'master' into x-updates	2013-03-17 11:28:28 +01:00
misc
mobile	xcodeenv: Add IPA file to Hydra build products	2013-03-15 16:18:45 +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 x-updates	2013-03-17 11:28:28 +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