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

..

common

…

Mac

hardend cliprdr

2015-06-18 03:04:31 -07:00

Sample

hardend channel audin

2015-06-18 03:04:31 -07:00

shadow

Merge remote-tracking branch 'upstream/master' into mh-stream-fix

2015-06-18 03:06:40 -07:00

Windows

…

.gitignore

…

CMakeLists.txt

…