Peter Simons 2d326e5032 Merge remote-tracking branch 'origin/master' into staging. ... Conflicts: pkgs/desktops/e18/enlightenment.nix		2014-08-04 16:51:47 +02:00
..
arduino
compilers	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
eclipse
guile-modules	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
interpreters	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
libraries	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
lisp-modules
misc	Turn some license strings into lib.licenses values	2014-07-28 11:31:14 +02:00
mobile	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
perl-modules	Partially revert 7a45996 some more.	2014-07-28 20:52:47 +02:00
python-modules	freecad: updating to 0.14	2014-08-01 16:56:27 +02:00
qtcreator	qtcreator: install desktop file	2014-08-02 21:11:36 +02:00
r-modules
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging.	2014-08-04 16:51:47 +02:00
web	Merge pull request #3003 from offlinehacker/nixpkg/nodejs/buildNodePackage/shellHook	2014-07-26 08:53:52 +02:00