Vladimír Čunát 292fb98d96 imagemagick: fix evaluation on mingw ... I made a mistake during conflict resolution in 7a005601d.		2016-05-10 18:22:34 +02:00
..
applications	imagemagick: fix evaluation on mingw	2016-05-10 18:22:34 +02:00
build-support	Merge branch 'master' into staging	2016-05-08 21:24:48 +02:00
data	Merge branch 'master' into staging	2016-05-08 21:24:48 +02:00
desktops	Merge branch 'master' into staging	2016-05-08 21:24:48 +02:00
development	Merge pull request #14900 from abbradar/python3-wrap	2016-05-10 12:22:48 +02:00
games	mudlet: mark broken	2016-05-09 10:01:49 -05:00
misc	Merge branch 'master' into staging	2016-05-08 21:24:48 +02:00
os-specific	alsaLib: 1.1.0 -> 1.1.1	2016-05-10 04:53:17 +02:00
servers	Merge branch 'master' into staging	2016-05-08 21:24:48 +02:00
shells	Merge remote-tracking branch 'upstream/master' into staging	2016-05-03 23:12:48 +03:00
stdenv	stdenv substituteAll: use yet another implementation	2016-05-08 19:41:50 +02:00
test	Remove cruft	2016-04-26 17:31:54 +02:00
tools	kst: mark broken	2016-05-09 10:01:09 -05:00
top-level	signon: remove obsolete alias	2016-05-09 10:06:19 -05:00