Merge branch 'master' of git.linuxmce.org:linuxmce/linuxmce

src/pluto_main/Define_Command.h

@@ -1043,6 +1043,7 @@
 #define COMMAND_Cancel_Egg_Timer_CONST 1157
 #define COMMAND_Swap_Media_CONST 1158
 #define COMMAND_Assign_Access_Token_CONST 1159
+#define COMMAND_Set_Color_Temp_CONST 1160
 
 #define COMMAND_TABLE "Command"
 #define COMMAND_PK_COMMAND_FIELD "PK_Command"

src/pluto_main/Define_Criteria.h

@@ -2,6 +2,9 @@
 #define __Define_Criteria_H__
 
 #define CRITERIA_Leave_Home_CONST 1
+#define CRITERIA_Watching_Media_CONST 2
+#define CRITERIA_Stop_Watching_CONST 3
+
 
 #define CRITERIA_TABLE "Criteria"
 #define CRITERIA_PK_CRITERIA_FIELD "PK_Criteria"