[Scummvm-cvs-logs] SF.net SVN: scummvm: [29540] scummvm/branches/gsoc2007-mixer/engines/kyra/ timer.cpp
dogmatixman at users.sourceforge.net
dogmatixman at users.sourceforge.net
Sat Nov 17 14:27:43 CET 2007
Revision: 29540
http://scummvm.svn.sourceforge.net/scummvm/?rev=29540&view=rev
Author: dogmatixman
Date: 2007-11-17 05:27:43 -0800 (Sat, 17 Nov 2007)
Log Message:
-----------
Fixed metadata that I missed in a conflict.
Modified Paths:
--------------
scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp
Property Changed:
----------------
scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp
Modified: scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp
===================================================================
--- scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp 2007-11-17 12:48:28 UTC (rev 29539)
+++ scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp 2007-11-17 13:27:43 UTC (rev 29540)
@@ -18,8 +18,8 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $URL: https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/branches/gsoc2007-mixer/engines/kyra/timer.cpp $
- * $Id: timer.cpp 28297 2007-07-29 16:33:11Z lordhoto $
+ * $URL$
+ * $Id$
*
*/
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