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

..

copyright

Merge branch 'master' into develop

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

libraries

Merge branch 'master' into develop

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

.name

Merge branch 'master' into develop

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

compiler.xml

Merge branch 'master' into develop

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

misc.xml

Merge branch 'master' into develop

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

modules.xml

Merge branch 'master' into develop

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

vcs.xml

Merge branch 'master' into develop

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