Vladimír Čunát e740b565cf Merge master into stdenv-updates ... Conflicts (easy): pkgs/development/compilers/llvm/default.nix pkgs/development/compilers/openjdk/default.nix pkgs/development/libraries/icu/default.nix pkgs/development/libraries/libssh/default.nix pkgs/development/libraries/libxslt/default.nix pkgs/development/tools/parsing/bison/3.x.nix		2013-12-29 10:01:22 +01:00
..
arduino
compilers	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
eclipse
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	2013-12-29 10:01:22 +01:00
libraries	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
lisp-modules	Merge branch 'origin/master' into stdenv-updates.	2013-12-16 21:13:24 +01:00
misc
mobile	Make xcode detection a bit more robust and configurable	2013-12-24 14:34:56 +01:00
ocaml-modules
perl-modules	perlPackages.DBFile: update from 1.826 to 1.831	2013-12-21 02:28:25 +02:00
python-modules	Merge master into x-updates	2013-12-23 19:27:14 +01:00
qtcreator
r-modules/generic
ruby-modules
tools	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
web	csslint: update from 0.5.0 to 0.10.0	2013-12-18 18:18:23 +02:00