Some safe merging with v2.

This commit is contained in:
Shyotl
2011-07-14 01:35:15 -05:00
parent 459f00ccb8
commit ce064f5af2
5 changed files with 76 additions and 34 deletions

View File

@@ -42,5 +42,6 @@ const U8 CLICK_ACTION_PAY = 3;
const U8 CLICK_ACTION_OPEN = 4;
const U8 CLICK_ACTION_PLAY = 5;
const U8 CLICK_ACTION_OPEN_MEDIA = 6;
const U8 CLICK_ACTION_ZOOM = 7;
// DO NOT CHANGE THE SEQUENCE OF THIS LIST!!
#endif