Merge from master

This commit is contained in:
KimLS
2015-07-15 23:15:25 -07:00
95 changed files with 25778 additions and 6435 deletions
+1
View File
@@ -761,6 +761,7 @@ typedef enum {
struct LauncherZoneRequest {
uint8 command;
char short_name[33];
uint16 port;
};
struct LauncherZoneStatus {