Merge branch 'master' of github.com:wmvanvliet/Chimara
[projects/chimara/chimara.git] / player / xepdmgrclient.h