Vladimír Čunát eb2e46aab2 Merge branch 'master' into x-updates ...

Conflicts:
	pkgs/applications/graphics/rawtherapee/default.nix
	pkgs/applications/misc/blender/default.nix
	pkgs/applications/networking/browsers/chromium/sources.nix
	pkgs/os-specific/linux/kernel/linux-3.9.nix
	pkgs/top-level/all-packages.nix

2013-04-04 21:43:40 +02:00

..

arduino

fix ino

2013-03-25 15:28:09 +01:00

compilers

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

eclipse

…

guile-modules

…

interpreters

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

libraries

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

misc

…

mobile

androidenv: fix error with obsolete quotation

2013-03-21 14:21:20 +01:00

ocaml-modules

…

perl-modules

Merge branch 'master' into stdenv-updates

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

python-modules

dbus-python: update the ancient version

2013-03-15 01:09:57 +01:00

qtcreator

…

ruby-modules

…

tools

Merge branch 'master' into x-updates

2013-04-04 21:43:40 +02:00

web

plone: upgrading to 4.3rc1

2013-03-31 08:53:23 +02:00