Vladimír Čunát 6e2d3b9847 Merge master into x-updates		2014-02-02 10:05:25 +01:00
..
applications	Update/fix merkaartor to 0.18.1	2014-02-02 12:54:46 +04:00
build-support	Do not assume a .rev attribute in available in src in maven-build.nix	2014-01-24 15:52:31 +01:00
data	Merge master into x-updates	2014-02-02 10:05:25 +01:00
desktops	gnome3: re-introduce libsoup dependency (fix many evals)	2014-02-01 10:10:45 +01:00
development	Merge master into x-updates	2014-02-02 10:05:25 +01:00
games	Fix previous simutrans 112.3 build	2014-02-01 18:22:47 +01:00
misc	Merge pull request #1583 from MarcWeber/submit/drop-myhasktags	2014-01-25 04:24:12 -08:00
os-specific	Merge master into x-updates	2014-02-02 10:05:25 +01:00
servers	Merge master into x-updates	2014-02-02 10:05:25 +01:00
shells	Merge master into stdenv-updates	2013-12-29 10:01:22 +01:00
stdenv	stdenv-linux: Fix binutils override	2014-01-28 15:23:57 +01:00
test
tools	youtubeDL: update from 2014.01.23.4 to 2014.01.30.2	2014-02-02 07:45:23 +02:00
top-level	Merge master into x-updates	2014-02-02 10:05:25 +01:00