Merge branch 'master' into develop

Browse Source

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

...

This commit is contained in:

Chris Teubert

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

parent 8d5af7e47e

commit cfdd183214

100 changed files with 4224 additions and 1912 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

1088

TestScripts/C Tests/main.c

File diff suppressed because it is too large Load Diff