Vladimír Čunát 85aafda509 merge #7299: gstreamer: Darwin fixes ... Solved trivial merge conflicts.		2015-04-29 17:53:09 +02:00
..
applications	merge #7299: gstreamer: Darwin fixes	2015-04-29 17:53:09 +02:00
build-support	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
data	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
desktops	remove plasma-5.2.2	2015-04-28 11:10:25 -05:00
development	merge #7299: gstreamer: Darwin fixes	2015-04-29 17:53:09 +02:00
games	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
misc	Merge pull request #7389 from AndersonTorres/atari++	2015-04-26 10:05:14 +02:00
os-specific	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
servers	mariadb: Propagate library paths in mysql_config	2015-04-28 18:27:39 -07:00
shells	meta.licenses -> license	2015-04-21 23:10:07 +02:00
stdenv	Merge 'master' into staging	2015-04-26 22:52:08 +02:00
test
tools	eggdrop: Refactor	2015-04-26 21:30:28 -07:00
top-level	libxml2: Refactor and fix library propagation	2015-04-28 18:27:39 -07:00