Vladimír Čunát dfdf164f87 Merge master into x-updates ... Conflicts (trivial): pkgs/games/spring/default.nix		2014-02-10 19:15:58 +01:00
..
arduino
compilers	Bumping ATS/Postiats version to 0.0.5.	2014-02-09 16:26:46 +01:00
eclipse
guile-modules
interpreters	pypy: support only linux for now	2014-02-08 20:27:57 +01:00
libraries	Merge master into x-updates	2014-02-10 19:15:58 +01:00
lisp-modules
misc	fixup previous commit: do the change to attribute	2014-01-31 18:51:10 +01:00
mobile	androidenv: also allow references to individual apk files	2014-01-28 19:09:08 +01:00
ocaml-modules
perl-modules
python-modules	Add fedpkg, koji &c. + their python dependencies.	2014-02-08 14:37:53 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	Merge master into x-updates	2014-02-10 19:15:58 +01:00
web	nodejs: fix the patch to make it build on darwin	2014-02-04 18:03:21 +01:00