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
compilers	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
eclipse
guile-modules
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
misc
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
python-modules	Merge branch 'master' into x-updates	2013-12-07 14:17:16 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	drush: add expression	2013-12-05 04:38:35 +00:00
web