Chris Teubert cfdd183214 Merge branch 'master' into develop ...

# Conflicts:
#	xpcPlugin/XPlaneConnect/mac.xpl
#	xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj

2016-02-29 12:48:30 -08:00

..

64

Merge branch 'master' into develop

2016-02-29 12:48:30 -08:00

lin.xpl

Merge branch 'master' into develop

2016-02-29 12:48:30 -08:00

mac.xpl

Mac Binary

2015-05-06 10:39:40 -07:00

win.xpl

Merge branch 'master' into develop

2016-02-29 12:48:30 -08:00