/[pcsx2_0.9.7]/branch/debug/0.X/0.9.X/0.9.7/ramdump-lateset/pcsx2/windows/VCprojects/svnrev.h
ViewVC logotype

Diff of /branch/debug/0.X/0.9.X/0.9.7/ramdump-lateset/pcsx2/windows/VCprojects/svnrev.h

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

--- branch/debug/0.X/0.9.X/0.9.7/ramdump-lateset/pcsx2/windows/VCprojects/svnrev.h	2011/01/21 03:52:59	396
+++ branch/debug/0.X/0.9.X/0.9.7/ramdump-lateset/pcsx2/windows/VCprojects/svnrev.h	2011/02/26 23:03:36	413
@@ -29,5 +29,9 @@
 //
 // TortoiseSVN can be downloaded from http://tortoisesvn.tigris.org
 
+<<<<<<< .mine
+#define SVN_REV 400
+=======
 #define SVN_REV 394
+>>>>>>> .r412
 #define SVN_MODS 1

 

  ViewVC Help
Powered by ViewVC 1.1.22