Armin Novak 4325741583 Merge remote-tracking branch 'origin/master' into tsmf-gstreamer-1.0 ... Conflicts: client/X11/xf_client.c		2014-06-11 11:27:08 +02:00
..
freerdp	Merge remote-tracking branch 'origin/master' into tsmf-gstreamer-1.0	2014-06-11 11:27:08 +02:00
CMakeLists.txt	install version.h	2013-11-06 17:44:17 +01:00