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

Conflicts:
	pkgs/development/compilers/vala/default.nix (it's different version)
	pkgs/development/libraries/cairo/default.nix (trivial)

2013-04-17 18:26:28 +02:00

..

1.12.2.nix

some libintl and libiconv cleanups + non-linux fixes

2013-04-14 13:43:09 +02:00

default.nix

Merge branch 'master' into x-updates

2013-04-17 18:26:28 +02:00