Vladimír Čunát 3ec2cea214 Merge master into x-updates ... Conflicts (auto-solved): pkgs/os-specific/linux/alsa-plugins/default.nix		2014-06-20 00:24:38 +02:00
..
arduino
compilers	Merge master into x-updates	2014-06-20 00:24:38 +02:00
eclipse
guile-modules
interpreters	pypy: correctly bump the version	2014-06-19 18:16:43 +02:00
libraries	Merge master into x-updates	2014-06-20 00:24:38 +02:00
lisp-modules
misc	avr-gcc: set meta.platforms = linux	2014-05-31 18:10:29 +02:00
mobile	Fix xpwn on Darwin and other case-insensitive file systems	2014-06-06 18:06:03 -04:00
ocaml-modules	fix evaluation (wrong meta.maintainers field)	2014-06-09 19:12:17 +02:00
perl-modules
python-modules	fixes #2926	2014-06-15 16:05:18 +02:00
qtcreator	qt5,qtcreator: update to qt-5.2.1 and qtcreator-3.1.	2014-06-11 21:30:21 +02:00
r-modules	cran-packages.nix: fix a couple of builds	2014-06-09 12:58:48 +02:00
ruby-modules
tools	leiningen: Update to 2.4.2.	2014-06-19 12:04:33 +02:00
web