Vladimír Čunát 7a005601d4 Merge branch 'master' to resolve conflicts		2016-05-05 08:25:38 +02:00
..
applications	Merge branch 'master' to resolve conflicts	2016-05-05 08:25:38 +02:00
build-support	Merge branch 'master' to resolve conflicts	2016-05-05 08:25:38 +02:00
data	geolite-legacy: 2016-05-02 -> 2016-05-03	2016-05-03 23:42:08 +02:00
desktops	Merge pull request #15215 from romildo/upd.xfce4-cpufreq-plugin	2016-05-04 21:37:33 +03:00
development	Merge branch 'master' to resolve conflicts	2016-05-05 08:25:38 +02:00
games	Init CKAN: The Comprehensive Kerbal Archive Network (#15202)	2016-05-04 02:12:39 +01:00
misc	Greybird: init at 2016-03-11	2016-05-03 06:45:17 -03:00
os-specific	Merge branch 'master' to resolve conflicts	2016-05-05 08:25:38 +02:00
servers	lighttpd: 1.4.37 -> 1.4.39	2016-05-03 16:15:20 +02:00
shells	oh-my-zsh: 2016-04-06 -> 2016-04-20	2016-04-30 01:43:31 +00:00
stdenv	stdenv on mingw: fix 64-bin DLL detection in some cases	2016-04-23 10:52:01 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	Merge branch 'master' to resolve conflicts	2016-05-05 08:25:38 +02:00
top-level	python-gui: init at 1.0.2, fixes #14958	2016-05-05 00:49:39 +02:00