Vladimír Čunát b4af993c3f Merge branch 'master' into staging ... Conflicts (simple): pkgs/development/lisp-modules/clwrapper/setup-hook.sh		2014-11-14 14:28:23 +01:00
..
arduino	arduino-core: fixup ELF interperter paths in prebuilt binaries	2014-10-27 22:04:02 +01:00
compilers	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
coq-modules	coqPackages.unimath: new expression	2014-11-12 14:37:25 -06:00
eclipse	Turn more licenses into lib.licenses style	2014-11-06 00:48:16 +00:00
guile-modules	guile-sdl: new package	2014-10-31 23:50:54 +08:00
interpreters	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
libraries	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
lisp-modules	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
lua-modules
misc
mobile	titaniumenv: Add parameter that configures Apple's WWDR certificate location	2014-10-28 11:40:12 +01:00
ocaml-modules	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00
perl-modules	Net::Amazon::S3: Shut up a big fat warning during Hydra startup	2014-11-06 15:42:06 +01:00
pharo	Update pharo-vm to 2014.10.28	2014-10-28 14:36:17 +01:00
pure-modules/pure-gsl
python-modules	buildPythonPackage: add python to propagatedBuildInputs	2014-11-13 21:04:13 +01:00
qtcreator
r-modules	r-RcmdrPlugin.ROC: disable broken build	2014-11-02 17:09:54 +01:00
ruby-modules
tools	Merge branch 'master' into staging	2014-11-14 14:28:23 +01:00
web	Merge remote-tracking branch 'origin/master' into staging	2014-11-11 23:48:08 +01:00