Vladimír Čunát 6690c97569 Merge branch 'master' into x-updates ... Conflicts (just different styles, same semantics): pkgs/development/libraries/libusb1/default.nix		2013-12-07 14:17:16 +01:00
..
arduino	ino: update to 0.3.6	2013-11-26 23:55:31 +01:00
compilers	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
eclipse
guile-modules	guile_ncurses: fix build	2013-11-29 02:41:28 +00:00
interpreters	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
libraries	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
lisp-modules	Updating ASDF	2013-11-25 10:59:36 +04:00
misc	Some description fixes	2013-10-05 19:36:23 +02:00
mobile	Revert android build tools update	2013-12-02 21:41:40 -05:00
ocaml-modules	added OCaml package ocamlsdl	2013-12-05 16:20:32 +01:00
perl-modules	Fix some meta.platforms attributes to build more stuff on Darwin	2013-11-05 10:46:59 +01:00
python-modules	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
qtcreator	qtcreator: Make the qt package optional and introduce the QtSDK	2013-10-21 09:36:45 +02:00
r-modules/generic
ruby-modules
tools	drush: add expression	2013-12-05 04:38:35 +00:00
web	fix build-node-package	2013-11-26 10:18:42 -05:00