Changed paths:
M src/PluginAuto/Mac/PluginEventMacCarbon.cpp
M src/PluginAuto/Mac/PluginEventMacCocoa.mm
M src/PluginAuto/Mac/PluginWindowMac.mm
M src/PluginAuto/Mac/PluginWindowMacCG.cpp
Changed paths:
M src/PluginAuto/Mac/PluginEventMacCarbon.cpp
M src/PluginAuto/Mac/PluginEventMacCocoa.mm
M src/PluginAuto/Mac/PluginWindowMac.mm
M src/PluginAuto/Mac/PluginWindowMacCG.cpp
Log Message:
-----------
Merge pull request #131 from ukreator/upstream_master
fixed clang++ and g++ c++11 "narrowing convertion" compilation errors