Vladimír Čunát 842420c3e1 Merge branch 'master' into stdenv-updates ... Conflicts (relatively simple): pkgs/development/interpreters/python/2.7/default.nix pkgs/development/libraries/dbus/default.nix pkgs/development/libraries/glib/default.nix pkgs/development/libraries/glibc/2.17/common.nix		2013-06-20 19:21:25 +02:00
..
applications	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
build-support	Merge remote-tracking branch 'origin/master' into stdenv-updates.	2013-06-01 11:48:21 +02:00
data	Merge remote-tracking branch 'hydra/master' into x-updates	2013-06-08 15:41:39 +00:00
desktops	libgnomeprint: build on linux	2013-06-18 22:50:15 +02:00
development	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
games	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
lib	Merge branch 'master' into x-updates	2013-06-17 22:08:16 +02:00
misc	Merge 'master' and 'stdenv-fixes' into x-updates	2013-06-16 10:13:51 +02:00
os-specific	wpa_supplicant: update 1.1 -> 2.0	2013-06-20 19:13:29 +02:00
servers	shishi: fix compilation on darwin	2013-06-20 09:08:09 +10:00
shells	fish: Add fish 2.0.0	2013-06-04 10:20:30 +01:00
stdenv	Revert "Merge pull request #567 from MarcWeber/submit/cmake-improvement"	2013-06-17 10:19:15 +02:00
test
tools	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00
top-level	Merge branch 'master' into stdenv-updates	2013-06-20 19:21:25 +02:00