Peter Simons 522acfd2f4 Merge remote-tracking branch 'master' into stdenv-updates. ... Conflicts: pkgs/applications/version-management/git-and-tools/git/default.nix pkgs/top-level/all-packages.nix		2013-07-30 11:29:30 +02:00
..
applications	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
build-support	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
data	make package use mirror:// for gnu, savannah and gnome repositories where possible	2013-07-14 05:23:06 +03:00
desktops	kde-base-artwork: fix hash.	2013-07-17 20:16:24 +02:00
development	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
games	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
lib	Maintainers: added ertes.	2013-07-19 19:52:11 +02:00
misc	Oxygen-gtk: upgrade to 1.3.4	2013-07-22 14:05:39 +02:00
os-specific	Linux 3.10.4	2013-07-28 20:16:16 -04:00
servers	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
shells	ipython: update to version 0.13.2	2013-07-23 14:15:30 +02:00
stdenv	Merge master into stdenv-updates	2013-07-08 10:48:05 +02:00
test
tools	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00
top-level	Merge remote-tracking branch 'master' into stdenv-updates.	2013-07-30 11:29:30 +02:00