Merge branch 'master' of http://github.com/zinnschlag/openmw

apps/openmw/mwscript/cellextensions.cpp

@@ -75,7 +75,7 @@ namespace MWScript
 
         const int opcodeCellChanged = 0x2000000;
         const int opcodeCOC = 0x2000026;
-        const int opcodeCOE = 0x200007c;
+        const int opcodeCOE = 0x200008e;
 
         void registerExtensions (Compiler::Extensions& extensions)
         {

apps/openmw/mwscript/docs/vmformat.txt

@@ -88,15 +88,11 @@ op 0x2000078: GetItemCount
 op 0x2000079: GetItemCount, explicit reference
 op 0x200007a: RemoveItem
 op 0x200007b: RemoveItem, explicit reference
-<<<<<<< HEAD:apps/openmw/mwscript/docs/vmformat.txt
-op 0x200007c: COC
-opcodes 0x200007d-0x3ffffff unused
-=======
 op 0x200007c: GetAiPackageDone
 op 0x200007d: GetAiPackageDone, explicit reference
 op 0x200007e-0x2000084: Enable Controls
 op 0x2000085-0x200008b: Disable Controls
 op 0x200008c: Unlock
 op 0x200008d: Unlock, explicit reference
-opcodes 0x200008e-0x3ffffff unused
->>>>>>> master:apps/openmw/mwscript/docs/vmformat.txt
+op 0x200008e: COE
+opcodes 0x200008f-0x3ffffff unused