Menu
▾
▴
[Desmume-cvs] SF.net SVN: desmume:[3862] branches/release_0_9_7/desmume
|
From: <ze...@us...> - 2010-11-18 02:37:03
|
Revision: 3862
http://desmume.svn.sourceforge.net/desmume/?rev=3862&view=rev
Author: zeromus
Date: 2010-11-18 02:36:55 +0000 (Thu, 18 Nov 2010)
Log Message:
-----------
etc
Added Paths:
-----------
branches/release_0_9_7/desmume/confosx
Property Changed:
----------------
branches/release_0_9_7/desmume/
branches/release_0_9_7/desmume/src/
branches/release_0_9_7/desmume/src/Disassembler.cpp
branches/release_0_9_7/desmume/src/FIFO.cpp
branches/release_0_9_7/desmume/src/armcpu.cpp
branches/release_0_9_7/desmume/src/bios.cpp
branches/release_0_9_7/desmume/src/cli/main.cpp
branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/Localizable.strings
branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/MainMenu.nib/
branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/Localizable.strings
branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/MainMenu.nib/
branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings
branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib/
branches/release_0_9_7/desmume/src/cp15.cpp
branches/release_0_9_7/desmume/src/ctrlssdl.cpp
branches/release_0_9_7/desmume/src/debug.cpp
branches/release_0_9_7/desmume/src/fs-linux.cpp
branches/release_0_9_7/desmume/src/fs-windows.cpp
branches/release_0_9_7/desmume/src/gdbstub/gdbstub.cpp
branches/release_0_9_7/desmume/src/sndsdl.cpp
branches/release_0_9_7/desmume/src/windows/AboutBox.cpp
branches/release_0_9_7/desmume/src/windows/CWindow.cpp
branches/release_0_9_7/desmume/src/windows/FirmConfig.cpp
branches/release_0_9_7/desmume/src/windows/IORegView.cpp
branches/release_0_9_7/desmume/src/windows/colorctrl.cpp
branches/release_0_9_7/desmume/src/windows/console.cpp
branches/release_0_9_7/desmume/src/windows/defaultconfig/
branches/release_0_9_7/desmume/src/windows/defaultconfig/SubWCRev.bat
branches/release_0_9_7/desmume/src/windows/defaultconfig/SubWCRev.exe
branches/release_0_9_7/desmume/src/windows/defaultconfig/intl3_tsvn.dll
branches/release_0_9_7/desmume/src/windows/defaultconfig/libapr_tsvn.dll
branches/release_0_9_7/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll
branches/release_0_9_7/desmume/src/windows/defaultconfig/svnrev.h
branches/release_0_9_7/desmume/src/windows/defaultconfig/svnrev_template.h
branches/release_0_9_7/desmume/src/windows/defaultconfig/userconfig.h
branches/release_0_9_7/desmume/src/windows/disView.cpp
branches/release_0_9_7/desmume/src/windows/ginfo.cpp
branches/release_0_9_7/desmume/src/windows/lightView.cpp
branches/release_0_9_7/desmume/src/windows/mapView.cpp
branches/release_0_9_7/desmume/src/windows/matrixView.cpp
branches/release_0_9_7/desmume/src/windows/memView.cpp
branches/release_0_9_7/desmume/src/windows/oamView.cpp
branches/release_0_9_7/desmume/src/windows/palView.cpp
branches/release_0_9_7/desmume/src/windows/snddx.cpp
branches/release_0_9_7/desmume/src/windows/tileView.cpp
Property changes on: branches/release_0_9_7/desmume
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_3:2355
/branches/release_0_9_4:2665-2666
/branches/release_0_9_6/desmume:3520-3522,3563
/branches/rerecording_0_9_2:2049,2075,2081-2087,2089
/trunk/desmume:3825-3826,3843,3855
/trunk/desmume/src/desmume:3814-3816
+ /branches/release_0_9_3:2355
/branches/release_0_9_4:2665-2666
/branches/release_0_9_6/desmume:3520-3522,3563
/branches/rerecording_0_9_2:2049,2075,2081-2087,2089
/trunk/desmume:3825-3826,3843,3855,3861
/trunk/desmume/src/desmume:3814-3816
Copied: branches/release_0_9_7/desmume/confosx (from rev 3861, trunk/desmume/confosx)
===================================================================
--- branches/release_0_9_7/desmume/confosx (rev 0)
+++ branches/release_0_9_7/desmume/confosx 2010-11-18 02:36:55 UTC (rev 3862)
@@ -0,0 +1 @@
+./configure CFLAGS="-arch i386" CXXFLAGS="-arch i386"
Property changes on: branches/release_0_9_7/desmume/src
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src:2665-2666
/branches/release_0_9_6/desmume/src:3520-3522,3563,3749
/branches/rerecording_0_9_2/src:2048-2049,2075,2081-2087,2089
/trunk/desmume/src:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src:3814-3816
+ /branches/release_0_9_4/src:2665-2666
/branches/release_0_9_6/desmume/src:3520-3522,3563,3749
/branches/rerecording_0_9_2/src:2048-2049,2075,2081-2087,2089
/trunk/desmume/src:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/Disassembler.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/Disassembler.cpp:2665-2666
/branches/release_0_9_6/desmume/src/Disassembler.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/Disassembler.cpp:2075
/trunk/desmume/src/Disassembler.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/Disassembler.cpp:3814-3816
+ /branches/release_0_9_4/src/Disassembler.cpp:2665-2666
/branches/release_0_9_6/desmume/src/Disassembler.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/Disassembler.cpp:2075
/trunk/desmume/src/Disassembler.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/Disassembler.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/FIFO.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/FIFO.cpp:2665-2666
/branches/release_0_9_6/desmume/src/FIFO.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/FIFO.cpp:2075
/trunk/desmume/src/FIFO.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/FIFO.cpp:3814-3816
+ /branches/release_0_9_4/src/FIFO.cpp:2665-2666
/branches/release_0_9_6/desmume/src/FIFO.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/FIFO.cpp:2075
/trunk/desmume/src/FIFO.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/FIFO.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/armcpu.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/armcpu.cpp:2665-2666
/branches/release_0_9_6/desmume/src/armcpu.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/armcpu.cpp:2075
/trunk/desmume/src/armcpu.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/armcpu.cpp:3814-3816
+ /branches/release_0_9_4/src/armcpu.cpp:2665-2666
/branches/release_0_9_6/desmume/src/armcpu.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/armcpu.cpp:2075
/trunk/desmume/src/armcpu.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/armcpu.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/bios.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/bios.cpp:2665-2666
/branches/release_0_9_6/desmume/src/bios.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/bios.cpp:2075
/trunk/desmume/src/bios.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/bios.cpp:3814-3816
+ /branches/release_0_9_4/src/bios.cpp:2665-2666
/branches/release_0_9_6/desmume/src/bios.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/bios.cpp:2075
/trunk/desmume/src/bios.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/bios.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cli/main.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cli/main.cpp:2665-2666
/branches/release_0_9_6/desmume/src/cli/main.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/cli/main.cpp:2075
/trunk/desmume/src/cli/main.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cli/main.cpp:3814-3816
+ /branches/release_0_9_4/src/cli/main.cpp:2665-2666
/branches/release_0_9_6/desmume/src/cli/main.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/cli/main.cpp:2075
/trunk/desmume/src/cli/main.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cli/main.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/Localizable.strings
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cocoa/translations/English.lproj/Localizable.strings:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/Localizable.strings:2075
/trunk/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3814-3816
+ /branches/release_0_9_4/src/cocoa/translations/English.lproj/Localizable.strings:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/Localizable.strings:2075
/trunk/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cocoa/translations/English.lproj/Localizable.strings:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/English.lproj/MainMenu.nib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cocoa/translations/English.lproj/MainMenu.nib:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/MainMenu.nib:2075
/trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3814-3816
+ /branches/release_0_9_4/src/cocoa/translations/English.lproj/MainMenu.nib:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/English.lproj/MainMenu.nib:2075
/trunk/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cocoa/translations/English.lproj/MainMenu.nib:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/Localizable.strings
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cocoa/translations/French.lproj/Localizable.strings:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/Localizable.strings:2075
/trunk/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3814-3816
+ /branches/release_0_9_4/src/cocoa/translations/French.lproj/Localizable.strings:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/Localizable.strings:2075
/trunk/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cocoa/translations/French.lproj/Localizable.strings:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/French.lproj/MainMenu.nib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cocoa/translations/French.lproj/MainMenu.nib:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/MainMenu.nib:2075
/trunk/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3814-3816
+ /branches/release_0_9_4/src/cocoa/translations/French.lproj/MainMenu.nib:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/French.lproj/MainMenu.nib:2075
/trunk/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cocoa/translations/French.lproj/MainMenu.nib:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/Localizable.strings:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/Localizable.strings:2075
/trunk/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3814-3816
+ /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/Localizable.strings:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/Localizable.strings:2075
/trunk/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cocoa/translations/Japanese.lproj/Localizable.strings:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2075
/trunk/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3814-3816
+ /branches/release_0_9_4/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2665-2666
/branches/release_0_9_6/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3520-3522,3563
/branches/rerecording_0_9_2/src/cocoa/translations/Japanese.lproj/MainMenu.nib:2075
/trunk/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cocoa/translations/Japanese.lproj/MainMenu.nib:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/cp15.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/cp15.cpp:2665-2666
/branches/release_0_9_6/desmume/src/cp15.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/cp15.cpp:2075
/trunk/desmume/src/cp15.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/cp15.cpp:3814-3816
+ /branches/release_0_9_4/src/cp15.cpp:2665-2666
/branches/release_0_9_6/desmume/src/cp15.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/cp15.cpp:2075
/trunk/desmume/src/cp15.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/cp15.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/ctrlssdl.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/ctrlssdl.cpp:2665-2666
/branches/release_0_9_6/desmume/src/ctrlssdl.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/ctrlssdl.cpp:2075
/trunk/desmume/src/ctrlssdl.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/ctrlssdl.cpp:3814-3816
+ /branches/release_0_9_4/src/ctrlssdl.cpp:2665-2666
/branches/release_0_9_6/desmume/src/ctrlssdl.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/ctrlssdl.cpp:2075
/trunk/desmume/src/ctrlssdl.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/ctrlssdl.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/debug.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/debug.cpp:2665-2666
/branches/release_0_9_6/desmume/src/debug.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/debug.cpp:2075
/trunk/desmume/src/debug.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
/trunk/desmume/src/desmume/src/debug.cpp:3814-3816
+ /branches/release_0_9_4/src/debug.cpp:2665-2666
/branches/release_0_9_6/desmume/src/debug.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/debug.cpp:2075
/trunk/desmume/src/debug.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
/trunk/desmume/src/desmume/src/debug.cpp:3814-3816
Property changes on: branches/release_0_9_7/desmume/src/fs-linux.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/fs-linux.cpp:2665-2666
/branches/release_0_9_6/desmume/src/fs-linux.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/fs-linux.cpp:2075
/trunk/desmume/src/desmume/src/fs-linux.cpp:3814-3816
/trunk/desmume/src/fs-linux.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/fs-linux.cpp:2665-2666
/branches/release_0_9_6/desmume/src/fs-linux.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/fs-linux.cpp:2075
/trunk/desmume/src/desmume/src/fs-linux.cpp:3814-3816
/trunk/desmume/src/fs-linux.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/fs-windows.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/fs-windows.cpp:2665-2666
/branches/release_0_9_6/desmume/src/fs-windows.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/fs-windows.cpp:2075
/trunk/desmume/src/desmume/src/fs-windows.cpp:3814-3816
/trunk/desmume/src/fs-windows.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/fs-windows.cpp:2665-2666
/branches/release_0_9_6/desmume/src/fs-windows.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/fs-windows.cpp:2075
/trunk/desmume/src/desmume/src/fs-windows.cpp:3814-3816
/trunk/desmume/src/fs-windows.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/gdbstub/gdbstub.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/gdbstub/gdbstub.cpp:2665-2666
/branches/release_0_9_6/desmume/src/gdbstub/gdbstub.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/gdbstub/gdbstub.cpp:2075
/trunk/desmume/src/desmume/src/gdbstub/gdbstub.cpp:3814-3816
/trunk/desmume/src/gdbstub/gdbstub.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/gdbstub/gdbstub.cpp:2665-2666
/branches/release_0_9_6/desmume/src/gdbstub/gdbstub.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/gdbstub/gdbstub.cpp:2075
/trunk/desmume/src/desmume/src/gdbstub/gdbstub.cpp:3814-3816
/trunk/desmume/src/gdbstub/gdbstub.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/sndsdl.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/sndsdl.cpp:2665-2666
/branches/release_0_9_6/desmume/src/sndsdl.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/sndsdl.cpp:2075
/trunk/desmume/src/desmume/src/sndsdl.cpp:3814-3816
/trunk/desmume/src/sndsdl.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/sndsdl.cpp:2665-2666
/branches/release_0_9_6/desmume/src/sndsdl.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/sndsdl.cpp:2075
/trunk/desmume/src/desmume/src/sndsdl.cpp:3814-3816
/trunk/desmume/src/sndsdl.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/AboutBox.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/AboutBox.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/AboutBox.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/AboutBox.cpp:2075
/trunk/desmume/src/desmume/src/windows/AboutBox.cpp:3814-3816
/trunk/desmume/src/windows/AboutBox.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/AboutBox.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/AboutBox.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/AboutBox.cpp:2075
/trunk/desmume/src/desmume/src/windows/AboutBox.cpp:3814-3816
/trunk/desmume/src/windows/AboutBox.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/CWindow.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/CWindow.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/CWindow.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/CWindow.cpp:2075
/trunk/desmume/src/desmume/src/windows/CWindow.cpp:3814-3816
/trunk/desmume/src/windows/CWindow.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/CWindow.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/CWindow.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/CWindow.cpp:2075
/trunk/desmume/src/desmume/src/windows/CWindow.cpp:3814-3816
/trunk/desmume/src/windows/CWindow.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/FirmConfig.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/FirmConfig.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/FirmConfig.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/FirmConfig.cpp:2075
/trunk/desmume/src/desmume/src/windows/FirmConfig.cpp:3814-3816
/trunk/desmume/src/windows/FirmConfig.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/FirmConfig.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/FirmConfig.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/FirmConfig.cpp:2075
/trunk/desmume/src/desmume/src/windows/FirmConfig.cpp:3814-3816
/trunk/desmume/src/windows/FirmConfig.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/IORegView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/IORegView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/IORegView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/IORegView.cpp:2075
/trunk/desmume/src/desmume/src/windows/IORegView.cpp:3814-3816
/trunk/desmume/src/windows/IORegView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/IORegView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/IORegView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/IORegView.cpp:2075
/trunk/desmume/src/desmume/src/windows/IORegView.cpp:3814-3816
/trunk/desmume/src/windows/IORegView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/colorctrl.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/colorctrl.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/colorctrl.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/colorctrl.cpp:2075
/trunk/desmume/src/desmume/src/windows/colorctrl.cpp:3814-3816
/trunk/desmume/src/windows/colorctrl.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/colorctrl.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/colorctrl.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/colorctrl.cpp:2075
/trunk/desmume/src/desmume/src/windows/colorctrl.cpp:3814-3816
/trunk/desmume/src/windows/colorctrl.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/console.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/console.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/console.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/console.cpp:2075
/trunk/desmume/src/desmume/src/windows/console.cpp:3814-3816
/trunk/desmume/src/windows/console.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/console.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/console.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/console.cpp:2075
/trunk/desmume/src/desmume/src/windows/console.cpp:3814-3816
/trunk/desmume/src/windows/console.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/defaultconfig:2048*,2075*
/trunk/desmume/src/desmume/src/windows/defaultconfig:3814-3816
/trunk/desmume/src/windows/defaultconfig:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/defaultconfig:2048*,2075*
/trunk/desmume/src/desmume/src/windows/defaultconfig:3814-3816
/trunk/desmume/src/windows/defaultconfig:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/SubWCRev.bat
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/SubWCRev.bat:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/SubWCRev.bat:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/SubWCRev.bat:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/SubWCRev.bat:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/SubWCRev.bat:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/SubWCRev.bat:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/SubWCRev.exe
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/SubWCRev.exe:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/SubWCRev.exe:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/SubWCRev.exe:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/SubWCRev.exe:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/SubWCRev.exe:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/SubWCRev.exe:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/intl3_tsvn.dll
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/intl3_tsvn.dll:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/intl3_tsvn.dll:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/intl3_tsvn.dll:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/intl3_tsvn.dll:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/intl3_tsvn.dll:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/intl3_tsvn.dll:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/libapr_tsvn.dll
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/libapr_tsvn.dll:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/libapr_tsvn.dll:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/libapr_tsvn.dll:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/libapr_tsvn.dll:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/libapr_tsvn.dll:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/libapr_tsvn.dll:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/libaprutil_tsvn.dll:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/libaprutil_tsvn.dll:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/svnrev.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/svnrev.h:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/svnrev.h:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/svnrev.h:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/svnrev.h:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/svnrev.h:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/svnrev.h:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/svnrev_template.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/defaultconfig/svnrev_template.h:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/svnrev_template.h:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/svnrev_template.h:3825-3826,3843,3855
+ /branches/release_0_9_4/src/windows/defaultconfig/svnrev_template.h:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/svnrev_template.h:3520-3522,3563
/trunk/desmume/src/windows/defaultconfig/svnrev_template.h:3825-3826,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/userconfig.h
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_3/src/windows/defaultconfig/userconfig.h:2355
/branches/release_0_9_4/src/windows/defaultconfig/userconfig.h:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/userconfig.h:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/defaultconfig/userconfig.h:2075
/trunk/desmume/src/desmume/src/windows/defaultconfig/userconfig.h:3814-3816
/trunk/desmume/src/windows/defaultconfig/userconfig.h:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_3/src/windows/defaultconfig/userconfig.h:2355
/branches/release_0_9_4/src/windows/defaultconfig/userconfig.h:2665-2666
/branches/release_0_9_6/desmume/src/windows/defaultconfig/userconfig.h:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/defaultconfig/userconfig.h:2075
/trunk/desmume/src/desmume/src/windows/defaultconfig/userconfig.h:3814-3816
/trunk/desmume/src/windows/defaultconfig/userconfig.h:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/disView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/disView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/disView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/disView.cpp:2075
/trunk/desmume/src/desmume/src/windows/disView.cpp:3814-3816
/trunk/desmume/src/windows/disView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/disView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/disView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/disView.cpp:2075
/trunk/desmume/src/desmume/src/windows/disView.cpp:3814-3816
/trunk/desmume/src/windows/disView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/ginfo.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/ginfo.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/ginfo.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/ginfo.cpp:2075
/trunk/desmume/src/desmume/src/windows/ginfo.cpp:3814-3816
/trunk/desmume/src/windows/ginfo.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/ginfo.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/ginfo.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/ginfo.cpp:2075
/trunk/desmume/src/desmume/src/windows/ginfo.cpp:3814-3816
/trunk/desmume/src/windows/ginfo.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/lightView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/lightView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/lightView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/lightView.cpp:2075
/trunk/desmume/src/desmume/src/windows/lightView.cpp:3814-3816
/trunk/desmume/src/windows/lightView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/lightView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/lightView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/lightView.cpp:2075
/trunk/desmume/src/desmume/src/windows/lightView.cpp:3814-3816
/trunk/desmume/src/windows/lightView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/mapView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/mapView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/mapView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/mapView.cpp:2075
/trunk/desmume/src/desmume/src/windows/mapView.cpp:3814-3816
/trunk/desmume/src/windows/mapView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/mapView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/mapView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/mapView.cpp:2075
/trunk/desmume/src/desmume/src/windows/mapView.cpp:3814-3816
/trunk/desmume/src/windows/mapView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/matrixView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/matrixView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/matrixView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/matrixView.cpp:2075
/trunk/desmume/src/desmume/src/windows/matrixView.cpp:3814-3816
/trunk/desmume/src/windows/matrixView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/matrixView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/matrixView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/matrixView.cpp:2075
/trunk/desmume/src/desmume/src/windows/matrixView.cpp:3814-3816
/trunk/desmume/src/windows/matrixView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/memView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/memView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/memView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/memView.cpp:2075
/trunk/desmume/src/desmume/src/windows/memView.cpp:3814-3816
/trunk/desmume/src/windows/memView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/memView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/memView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/memView.cpp:2075
/trunk/desmume/src/desmume/src/windows/memView.cpp:3814-3816
/trunk/desmume/src/windows/memView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/oamView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/oamView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/oamView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/oamView.cpp:2075
/trunk/desmume/src/desmume/src/windows/oamView.cpp:3814-3816
/trunk/desmume/src/windows/oamView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/oamView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/oamView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/oamView.cpp:2075
/trunk/desmume/src/desmume/src/windows/oamView.cpp:3814-3816
/trunk/desmume/src/windows/oamView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/palView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/palView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/palView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/palView.cpp:2075
/trunk/desmume/src/desmume/src/windows/palView.cpp:3814-3816
/trunk/desmume/src/windows/palView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/palView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/palView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/palView.cpp:2075
/trunk/desmume/src/desmume/src/windows/palView.cpp:3814-3816
/trunk/desmume/src/windows/palView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/snddx.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/snddx.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/snddx.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/snddx.cpp:2075
/trunk/desmume/src/desmume/src/windows/snddx.cpp:3814-3816
/trunk/desmume/src/windows/snddx.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/snddx.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/snddx.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/snddx.cpp:2075
/trunk/desmume/src/desmume/src/windows/snddx.cpp:3814-3816
/trunk/desmume/src/windows/snddx.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
Property changes on: branches/release_0_9_7/desmume/src/windows/tileView.cpp
___________________________________________________________________
Modified: svn:mergeinfo
- /branches/release_0_9_4/src/windows/tileView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/tileView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/tileView.cpp:2075
/trunk/desmume/src/desmume/src/windows/tileView.cpp:3814-3816
/trunk/desmume/src/windows/tileView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855
+ /branches/release_0_9_4/src/windows/tileView.cpp:2665-2666
/branches/release_0_9_6/desmume/src/windows/tileView.cpp:3520-3522,3563
/branches/rerecording_0_9_2/src/windows/tileView.cpp:2075
/trunk/desmume/src/desmume/src/windows/tileView.cpp:3814-3816
/trunk/desmume/src/windows/tileView.cpp:3814-3816,3819,3821-3822,3824-3826,3831-3832,3843,3855,3861
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|