Commit Graph

2 Commits

Author SHA1 Message Date
Jason Watkins
d12cc02368 More copyright updates 2016-03-04 13:59:32 -08:00
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