Merge branch 'release-1.0.1' into develop

Browse Source

Conflicts:
	C/src/xplaneConnect.c
	MATLAB/+XPlaneConnect/XPlaneConnect.jar
	MATLAB/+XPlaneConnect/sendDREF.m
	xpcPlugin/XPlaneConnect/mac.xpl

...

This commit is contained in:

Jason Watkins

2015-05-14 13:20:15 -07:00

parent bd0c15bede 1cde0e4086

commit 238c82454c

10 changed files with 23 additions and 9 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

0

xpcPlugin/XPlaneConnect/mac.xpl Executable file → Normal file