Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
default.nix	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
gtk3.nix	Merge branch 'master' into closure-size	2016-04-01 10:06:01 +02:00
libfakeXinerama.nix	Fix/update Xpra	2015-02-25 01:09:39 +01:00