Martin Haimberger 2862109337 Merge remote-tracking branch 'upstream/master' into mh-channel-fix ... Conflicts: channels/smartcard/client/smartcard_main.c channels/smartcard/client/smartcard_operations.c		2015-07-30 07:29:12 -07:00
..
common	Revert a bug introduced in PR #2134	2014-11-12 17:15:13 +01:00
Mac	Merge remote-tracking branch 'upstream/master' into mh-channel	2015-07-15 01:57:07 -07:00
Sample	Merge remote-tracking branch 'upstream/master' into mh-channel	2015-07-15 01:57:07 -07:00
shadow	Merge remote-tracking branch 'upstream/master' into mh-channel-fix	2015-07-30 07:29:12 -07:00
Windows	Merge remote-tracking branch 'upstream/master' into mh-channel	2015-07-15 01:57:07 -07:00
.gitignore	shadow: start simplifying X11 shadow server	2014-07-10 16:32:46 -04:00
CMakeLists.txt	build: cmake 3.1 compatibility	2014-12-12 19:26:22 +01:00