[Scummvm-cvs-logs] CVS: scummvm/scumm string.cpp,1.154,1.155

Travis Howell kirben at users.sourceforge.net
Thu Aug 28 05:24:16 CEST 2003


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv19161/scumm

Modified Files:
	string.cpp 
Log Message:

Remove junk


Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/string.cpp,v
retrieving revision 1.154
retrieving revision 1.155
diff -u -d -r1.154 -r1.155
--- string.cpp	28 Aug 2003 12:21:35 -0000	1.154
+++ string.cpp	28 Aug 2003 12:23:35 -0000	1.155
@@ -16,11 +16,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  *
-<<<<<<< string.cpp
- * $Header$
-=======
  * $Header$
->>>>>>> 1.153
  *
  */
 





More information about the Scummvm-git-logs mailing list