Michael Raskin 8271de6727 Merge remote-tracking branch 'upstream/master' into x-updates ... Conflicts: pkgs/misc/emulators/wine/default.nix		2013-06-10 10:04:46 +04:00
..
arduino	fix ino	2013-03-25 15:28:09 +01:00
compilers	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
libraries	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
misc	AVR GCC: enable C++ support (makes it usable with Arduino)	2012-12-23 18:20:34 +02:00
mobile	Override the KitchenSink's appName	2013-05-29 15:17:37 +02:00
ocaml-modules	Remove a bunch of unreferenced files	2012-11-29 13:43:37 +01:00
perl-modules	Module::Pluggable: Update to 4.8	2013-06-02 23:33:27 +02:00
python-modules	pygame: update to 1.9.1	2013-06-09 12:12:15 +08:00
qtcreator	qtcreator: Update to 2.7.1 and improvements (merge #579)	2013-06-01 12:53:17 +02:00
ruby-modules
tools	Merge remote-tracking branch 'upstream/master' into x-updates	2013-06-10 10:04:46 +04:00
web	fix node packages with binary (native) extensions	2013-06-06 22:38:24 +02:00