Menu
▾
▴
[Desmume-cvs] SF.net SVN: desmume:[3835] branches/release_0_9_7/desmume
|
From: <ze...@us...> - 2010-10-27 05:00:04
|
Revision: 3835
http://desmume.svn.sourceforge.net/desmume/?rev=3835&view=rev
Author: zeromus
Date: 2010-10-27 04:59:56 +0000 (Wed, 27 Oct 2010)
Log Message:
-----------
merge 3825-3862 from trunk
Modified Paths:
--------------
branches/release_0_9_7/desmume/src/windows/memView.cpp
branches/release_0_9_7/desmume/src/windows/ramwatch.cpp
branches/release_0_9_7/desmume/src/windows/resource.h
branches/release_0_9_7/desmume/src/windows/resources.rc
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/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
/trunk/desmume/src/desmume:3814-3816
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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
/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
/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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/SubWCRev.bat
___________________________________________________________________
Added: 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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/SubWCRev.exe
___________________________________________________________________
Added: 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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/intl3_tsvn.dll
___________________________________________________________________
Added: 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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/libapr_tsvn.dll
___________________________________________________________________
Added: 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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/libaprutil_tsvn.dll
___________________________________________________________________
Added: 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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/svnrev.h
___________________________________________________________________
Added: 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
Property changes on: branches/release_0_9_7/desmume/src/windows/defaultconfig/svnrev_template.h
___________________________________________________________________
Added: 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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
Modified: branches/release_0_9_7/desmume/src/windows/memView.cpp
===================================================================
--- branches/release_0_9_7/desmume/src/windows/memView.cpp 2010-10-27 04:44:26 UTC (rev 3834)
+++ branches/release_0_9_7/desmume/src/windows/memView.cpp 2010-10-27 04:59:56 UTC (rev 3835)
@@ -390,6 +390,8 @@
{
case 0:
{
+ SetDlgItemText(wnd->hWnd,IDC_2012,"");
+
curx += (fontsize.cx * 2);
for(i = 0; i < 16; i++)
{
@@ -422,6 +424,8 @@
case 1:
{
+ SetDlgItemText(wnd->hWnd,IDC_2012,"");
+
curx += (fontsize.cx * 6);
for(i = 0; i < 16; i += 2)
{
@@ -456,6 +460,12 @@
case 2:
{
+ u8 smallbuf[4];
+ MMU_DumpMemBlock(wnd->cpu, wnd->selAddress, 4, smallbuf);
+ char textbuf[32];
+ sprintf(textbuf,"%f",((s32)T1ReadLong(smallbuf,0))/4096.0f);
+ SetDlgItemText(wnd->hWnd,IDC_2012,textbuf);
+
curx += (fontsize.cx * 8);
for(i = 0; i < 16; i += 4)
{
@@ -604,7 +614,6 @@
col = ((x - (fontsize.cx * 8)) / (fontsize.cx * (8+1)) * 4);
wnd->sel = TRUE;
-
}
break;
}
@@ -612,6 +621,7 @@
wnd->selAddress = (wnd->address + (line << 4) + col);
wnd->selPart = 0;
wnd->selNewVal = 0x00000000;
+
}
SelectObject(hdc, font);
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,3831-3832
+ /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
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,3831-3832
+ /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
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,3831-3832
+ /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
Modified: branches/release_0_9_7/desmume/src/windows/ramwatch.cpp
===================================================================
--- branches/release_0_9_7/desmume/src/windows/ramwatch.cpp 2010-10-27 04:44:26 UTC (rev 3834)
+++ branches/release_0_9_7/desmume/src/windows/ramwatch.cpp 2010-10-27 04:59:56 UTC (rev 3835)
@@ -683,6 +683,9 @@
case 'h':
SendDlgItemMessage(hDlg, IDC_HEX, BM_SETCHECK, BST_CHECKED, 0);
break;
+ case 'f':
+ SendDlgItemMessage(hDlg, IDC_2012, BM_SETCHECK, BST_CHECKED, 0);
+ break;
default:
t = 0;
break;
@@ -703,6 +706,9 @@
case IDC_HEX:
t='h';
return true;
+ case IDC_2012:
+ t='f';
+ return true;
case IDC_1_BYTE:
s = 'b';
return true;
@@ -967,13 +973,18 @@
int t = rswatches[iNum].Type;
int size = rswatches[iNum].Size;
const char* formatString = ((t=='s') ? "%d" : (t=='u') ? "%u" : (size=='d' ? "%08X" : size=='w' ? "%04X" : "%02X"));
- switch (size)
+ if(t=='f')
{
- case 'b':
- default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break;
- case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break;
- case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break;
+ sprintf(num,"%f",i/4096.0f);
}
+ else
+ switch (size)
+ {
+ case 'b':
+ default: sprintf(num, formatString, t=='s' ? (char)(i&0xff) : (unsigned char)(i&0xff)); break;
+ case 'w': sprintf(num, formatString, t=='s' ? (short)(i&0xffff) : (unsigned short)(i&0xffff)); break;
+ case 'd': sprintf(num, formatString, t=='s' ? (long)(i&0xffffffff) : (unsigned long)(i&0xffffffff)); break;
+ }
Item->item.pszText = num;
} return true;
Modified: branches/release_0_9_7/desmume/src/windows/resource.h
===================================================================
--- branches/release_0_9_7/desmume/src/windows/resource.h 2010-10-27 04:44:26 UTC (rev 3834)
+++ branches/release_0_9_7/desmume/src/windows/resource.h 2010-10-27 04:59:56 UTC (rev 3835)
@@ -248,6 +248,7 @@
#define IDC_2_BYTES 958
#define IDC_4_BYTES 959
#define IDC_WATCHLIST 960
+#define IDC_HEX2 960
#define IDC_C_WATCH_EDIT 961
#define IDC_C_WATCH_REMOVE 962
#define IDC_C_WATCH 963
@@ -386,6 +387,7 @@
#define IDC_RFILE 1038
#define IDC_EXPORT 1038
#define IDC_RFOLDER 1039
+#define IDC_2012 1039
#define IDC_BBROWSE2 1040
#define IDC_PATHDESMUME 1041
#define IDC_BRESTART 1042
@@ -770,8 +772,8 @@
#define ID_LABEL_HK51 4515
#define ID_LABEL_HK52 4516
#define ID_LABEL_HK53 4517
-#define ID_LABEL_HK54 4519
#define ID_LABEL_HK13b 4518
+#define ID_LABEL_HK54 4519
#define IDD_MICROPHONE 5000
#define IDM_MICROPHONESETTINGS 5001
#define IDC_MICSAMPLEBROWSE 5003
@@ -781,12 +783,8 @@
#define IDC_USENOISE 5010
#define IDC_CPU 6000
#define IDC_IOREG 6001
-
-//ZELDA SHADOW HACK
-#define ID_LABEL_ZELDA_SHADOW_DEPTH_HACK 9000
-#define IDC_ZELDA_SHADOW_DEPTH_HACK 9001
-
-
+#define ID_LABEL_ZELDA_SHADOW_DEPTH_HACK 9000
+#define IDC_ZELDA_SHADOW_DEPTH_HACK 9001
#define IDD_CHEAT_ADD_XX_CODE 10005
#define IDD_GBASLOT_GUITARGRIP 10009
#define IDD_GBASLOT_PIANO 10010
@@ -954,7 +952,7 @@
#ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 123
#define _APS_NEXT_COMMAND_VALUE 40085
-#define _APS_NEXT_CONTROL_VALUE 1039
+#define _APS_NEXT_CONTROL_VALUE 1040
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
Modified: branches/release_0_9_7/desmume/src/windows/resources.rc
===================================================================
--- branches/release_0_9_7/desmume/src/windows/resources.rc 2010-10-27 04:44:26 UTC (rev 3834)
+++ branches/release_0_9_7/desmume/src/windows/resources.rc 2010-10-27 04:59:56 UTC (rev 3835)
@@ -698,7 +698,7 @@
|