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

..

BasicOperation

Updated Java example.

2015-05-01 14:28:33 -07:00

ContinuousOperation

Merge branch 'master' into develop

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

Playback

Merge branch 'master' into develop

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