Chris Teubert d548186252 Merge remote-tracking branch 'origin/develop' into develop ...

# Conflicts:
#	C/src/xplaneConnect.c
#	xpcPlugin/XPlaneConnect/mac.xpl
#	xpcPlugin/xpcPlugin.xcodeproj/project.pbxproj

2016-02-29 12:51:42 -08:00

..

project.xcworkspace

Removed files that were previously in version control that should be ignored.

2015-03-25 11:32:40 -07:00

project.pbxproj

Merge remote-tracking branch 'origin/develop' into develop

2016-02-29 12:51:42 -08:00