Eelco Dolstra f64d84698e Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/applications/audio/espeak/edit.nix pkgs/applications/audio/lmms/default.nix pkgs/desktops/e18/enlightenment.nix pkgs/games/exult/default.nix pkgs/os-specific/linux/alsa-plugins/default.nix		2014-07-28 11:30:49 +02:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
eclipse	ecj: Build on Darwin	2014-07-15 11:51:27 +02:00
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
lisp-modules	fetchbzr, fetchdarcs, fetchhg: use rev attr	2014-06-28 21:06:10 +02:00
misc
mobile	Merge remote-tracking branch 'origin/master' into staging	2014-07-22 11:00:00 +02:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-07-07 13:16:26 +02:00
perl-modules
python-modules	python-wrapper: Fix fixup for wrapped argv[0].	2014-07-28 04:18:21 +02:00
qtcreator
r-modules	Added CRAN archive to R package derivation to prevent R expressions from	2014-07-08 11:02:05 +10:00
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-07-28 11:30:49 +02:00
web	Merge pull request #3003 from offlinehacker/nixpkg/nodejs/buildNodePackage/shellHook	2014-07-26 08:53:52 +02:00