Merge branch 'ovenwerks-master'

2015-06-08 17:22:48 -04:00
parent 88b0e0cd0b 72416e9432
commit 963b56b1c6
1 changed files with 7 additions and 4 deletions
--- a/libs/surfaces/mackie/button.h
+++ b/libs/surfaces/mackie/button.h
@@ -70,10 +70,6 @@ public:
 		Busses,
 		Outputs,
 		User,
-		Shift,
-		Option,
-		Ctrl,
-		CmdAlt,
 		Read,
 		Write,
 		Trim,
@@ -107,6 +103,13 @@ public:

 		FinalGlobalButton,

+		/* Global buttons that users should not redefine */
+
+		Shift,
+		Option,
+		Ctrl,
+		CmdAlt,
+
 		/* Strip buttons */
 		
 		RecEnable,