Vladimír Čunát 7e0b78f7b2 Merge master into x-updates ... Conflicts (re-created on master, preserved): pkgs/development/compilers/llvm/3.3/more-memory-for-bugpoint.patch		2014-01-23 22:52:18 +01:00
..
arduino	ino: update to 0.3.6	2013-11-26 23:55:31 +01:00
compilers	Fix tarball	2014-01-22 15:54:40 -05:00
eclipse	ecj: Add a setup hook that makes Ant use ECJ automatically	2014-01-06 14:36:15 +01:00
guile-modules	guile_lib: update from 0.2.1 to 0.2.2	2013-12-16 01:36:18 +02:00
interpreters	Merge master into stdenv-updates	2014-01-20 19:39:28 +01:00
libraries	Merge master into x-updates	2014-01-23 22:52:18 +01:00
lisp-modules	Merge master into stdenv-updates	2014-01-12 12:29:24 +01:00
misc	ati-drivers: update to 13.12 (close #1569)	2014-01-23 12:11:28 +01:00
mobile	titaniumsdk: colored output makes a web server think that logs are in raw format. So disable it	2014-01-23 17:11:16 +01:00
ocaml-modules	Update OCaml library Camomile to version 0.8.5	2014-01-18 20:56:45 +00:00
perl-modules	perlPackages.DBFile: update from 1.826 to 1.831	2013-12-21 02:28:25 +02:00
python-modules	kde4(10).pykde4: fix build via downgrading sip and pyqt4	2014-01-16 08:59:31 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	findbugs: Clean up packaging	2014-01-23 14:17:44 +01:00
web	Fixed xcode patch to make nodejs work on darwin again	2014-01-13 13:48:04 +01:00