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

..

SDK

Initial Version

2014-10-22 15:52:38 -07:00

xpcPlugin

Fixed logging bug with varargs and dialed back excessive trace logging in Message.

2015-05-14 14:23:11 -07:00

xpcPlugin.xcodeproj

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

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

XPlaneConnect

Merge branch 'master' into develop

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

CMakeLists.txt

Merge branch 'master' into develop

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

DataManager.cpp

Merge branch 'master' into develop

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

DataManager.h

Merge branch 'master' into develop

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

Drawing.cpp

Merge branch 'master' into develop

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

Drawing.h

Merge branch 'master' into develop

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

Log.cpp

Merge branch 'master' into develop

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

Log.h

Merge branch 'master' into develop

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

Message.cpp

Merge branch 'master' into develop

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

Message.h

Merge branch 'master' into develop

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

MessageHandlers.cpp

Merge branch 'master' into develop

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

MessageHandlers.h

Merge branch 'master' into develop

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

UDPSocket.cpp

Merge branch 'master' into develop

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

UDPSocket.h

Merge branch 'master' into develop

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

XPCPlugin.cpp

Merge branch 'master' into develop

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