Martin Haimberger 6e4e1c2773 Merge remote-tracking branch 'upstream/master' into mh-stream-fix ... Conflicts: client/Windows/wf_cliprdr.c		2015-06-18 03:06:40 -07:00
..
winpr	Merge remote-tracking branch 'upstream/master' into mh-stream-fix	2015-06-18 03:06:40 -07:00
CMakeLists.txt	Added version and build info functions	2015-03-30 17:51:29 +02:00