Vladimír Čunát 26af997d41 Merge branch 'master' into stdenv-updates ...

Conflicts (simple):
	pkgs/applications/networking/browsers/chromium/default.nix
	pkgs/development/libraries/libsoup/default.nix
	pkgs/os-specific/linux/kernel/manual-config.nix
	pkgs/os-specific/linux/qemu-kvm/default.nix

2013-03-02 10:41:53 +01:00

..

arduino

…

compilers

Merge branch 'master' into stdenv-updates

2013-03-02 10:41:53 +01:00

eclipse

…

guile-modules

…

interpreters

Merge branch 'master' into stdenv-updates

2013-03-02 10:41:53 +01:00

libraries

Merge branch 'master' into stdenv-updates

2013-03-02 10:41:53 +01:00

misc

…

mobile

Merge remote-tracking branch 'origin/master' into stdenv-updates

2013-02-15 13:36:34 +01:00

ocaml-modules

…

perl-modules

Merge branch 'master' into stdenv-updates

2013-03-02 10:41:53 +01:00

python-modules

…

qtcreator

…

ruby-modules

…

tools

Merge branch 'master' into stdenv-updates

2013-03-02 10:41:53 +01:00

web

Merge remote-tracking branch 'origin/master' into stdenv-updates

2013-02-15 13:36:34 +01:00