Eelco Dolstra 09dc132e04 Merge remote-tracking branch 'origin/master' into staging ... Conflicts: pkgs/development/libraries/poppler/default.nix		2014-10-16 15:16:50 +02:00
..
arduino	arduino-core: bump version from 1.0.2 to 1.0.6	2014-10-12 12:42:57 +01:00
compilers	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
coq-modules	coqPackages.ssreflect, more: build ssrcoq binary, add maintainer	2014-10-13 16:11:33 -05:00
eclipse
guile-modules
interpreters	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
libraries	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
lisp-modules	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
lua-modules	lua: Fixed luasql.patch	2014-10-01 06:00:06 +01:00
misc
mobile	titaniumenv: Use new xcodeenv simulate function in the example app	2014-10-15 17:28:52 +02:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
perl-modules
pharo	pharo-vm: Add dependency to cairo	2014-10-09 16:56:54 +02:00
pure-modules/pure-gsl	Add pure-gsl package	2014-10-14 21:21:36 +11:00
python-modules	python: collision in names when developing 2 and more python packages with nix	2014-09-19 14:23:45 +02:00
qtcreator	qtcreator: Update from 3.1.0 to 3.2.0	2014-10-05 21:23:00 +02:00
r-modules	Merge pull request #4368 from michelk/r-XML	2014-10-04 19:56:18 +02:00
ruby-modules
tools	Merge remote-tracking branch 'origin/master' into staging	2014-10-16 15:16:50 +02:00
web	Merge remote-tracking branch 'origin/master' into staging	2014-10-07 00:09:37 +02:00