[Scummvm-cvs-logs] SF.net SVN: scummvm: [29218] scummvm/trunk/engines/kyra/kyra_v2.cpp

vinterstum at users.sourceforge.net vinterstum at users.sourceforge.net
Sun Oct 14 19:00:44 CEST 2007


Revision: 29218
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29218&view=rev
Author:   vinterstum
Date:     2007-10-14 10:00:44 -0700 (Sun, 14 Oct 2007)

Log Message:
-----------
A change got lost while resolving a conflict

Modified Paths:
--------------
    scummvm/trunk/engines/kyra/kyra_v2.cpp

Modified: scummvm/trunk/engines/kyra/kyra_v2.cpp
===================================================================
--- scummvm/trunk/engines/kyra/kyra_v2.cpp	2007-10-14 16:58:11 UTC (rev 29217)
+++ scummvm/trunk/engines/kyra/kyra_v2.cpp	2007-10-14 17:00:44 UTC (rev 29218)
@@ -1641,7 +1641,6 @@
 		// 0x88
 		Opcode(o2_countItemInstances),
 		OpcodeUnImpl(),
-		OpcodeUnImpl(),
 		Opcode(o2_initObject),
 		OpcodeUnImpl(),
 		// 0x8c


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list