Commit Graph

280 Commits

Author SHA1 Message Date
John Peterson d4f8f0d3ae Added the StretchToFit option to the config menu in the OpenGL plugin. This fixes the blackness in SSBM. I also added a keep aspect ratio option, it will keep your aspect ratio at 4:3, but then SSBM will have the blackness problem again. You find the options under the Enhancements window in the OpenGL configuration.
I also added a wx debugging window for the OpenGL plugin. I connected it to the old console window that was in the plugin. Other than that it doesn't do anything at the moment but it could be useful to show all the current important information and parameter statuses and so on.

Again there's a problem with wx windows collisions.  Show() can't be used because then DLL_PROCESS_DETACH is called immediately after the window is opened, and if we open it with ShowModal() before we have loaded a game the main video window will be blocked. And we can't pass on any variables from a DllDebugger() that is called when Dolphin is started because the dll is reloaded and lose all variables sometime before a game is loaded. So we can't auto open the window that way. So I made the debugging window open as a game is loaded if it is enabled in the ini, the downside is that the ini setting will open the window even if we are not opening Dolphin with the -d flag. However, this will only affect people that have used the debugger at least once so in my opinion this is the most convenient solution. But feel free to come up with a better solution. Preferably some solution to how to use Show() and preventing DLL_PROCESS_DETACH to be called.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@812 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-09 18:47:53 +00:00
memberTwo.mb2 0464cba75e Bunch of fix for DC mode (Metroid starts now,etc.). Look stable now but need to be seriously tested. CriticalSection shouldn't be needed anymore. TODO: linux and fix that High/LowWaterMark problem (CPU waste is time waiting for an empty fifo for now)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@791 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-07 21:39:50 +00:00
XTra.KrazzY c69506bb46 Chests on LoZ:WW are now texture mapped correctly (as should many other weirdnesses) in DX9.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@775 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 22:47:28 +00:00
XTra.KrazzY 8eef6f9cd5 Moved components' perks computation to the DecodedVArray in DX9. Performance boost. Working on OGL version
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@771 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-04 21:47:56 +00:00
memberTwo.mb2 8d0f6d40f4 DataReader inline for OGL/DX9 and moved to VideoCommon. Large clean up.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@760 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-03 22:05:28 +00:00
hrydgard 655bc23322 fix some comments, some files with mixed line endings, some warnings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@757 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-03 17:22:35 +00:00
hrydgard 65f8c4bca1 unbreak DX9 build.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@747 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-02 19:59:50 +00:00
nakeee 4923da76d7 all this to make stop work without message passing
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@744 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-10-02 17:03:24 +00:00
Shawn Hoffman 6178eae001 made all plugins build with correct names and paths. (windows). for some reason njoy and padsimple don't show that they have been compiled with debugfast in their name, not sure why.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@733 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-30 01:09:02 +00:00
memberTwo.mb2 df9eba79b2 DataReader migration to faster one: first step.
TODO: doing it for DX9, move DataReader to VideoCommon, remove dirty debug #def if ok

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@729 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-29 17:29:25 +00:00
hrydgard fb79bc9224 Disable screen saver in the gfx plugin window management too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@720 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-28 17:47:44 +00:00
fires.gc 55867c169a update to vs2008
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@664 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-24 17:09:29 +00:00
donkopunchstania 17cff80f2b BIOS sets video mode from emulator configuration. Fixed iteration in DX VShaderCache::Cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@644 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-23 20:55:01 +00:00
XTra.KrazzY 0f4d04f4fb Fixed DX9's 16 and 24 bit comparisons.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@593 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-21 10:21:37 +00:00
XTra.KrazzY ae948f1a23 Added point size emulation to DX9
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@587 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 15:04:02 +00:00
XTra.KrazzY 7c3f715f19 More fog emulation groundwork both in OpenGL and DX9. Needs more fog format researching.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@586 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 14:43:10 +00:00
XTra.KrazzY a5488ccf58 Initial steps towards fog emulation in DX9
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@585 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-20 14:29:30 +00:00
fires.gc f198d550bc fix for small memory leaks
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@562 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-17 08:40:52 +00:00
XTra.KrazzY ba4143e82b Optimized vertex and pixel shader generation. Medium FPS boost.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@500 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-12 19:04:13 +00:00
hrydgard 81e937041f fix 64-bit build too on Platform SDK 6.0, fix project file.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@453 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 11:07:55 +00:00
hrydgard 5a69fca0be Add some missing GPL headers, fix building with Platform SDK 6.0, delete unused HTTP code.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@452 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-07 10:29:46 +00:00
Maarten ter Huurne 722ea233a1 Align stack to 16-byte boundary when compiling in 32-bit mode with GCC. This is required to run anything on OS X and to support SSE instructions on Linux.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@439 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-05 00:02:53 +00:00
Maarten ter Huurne bd7996354a Removed "INT" typedef: it was not used in any plugin spec. It was used DX9 video plugin, but for arguments where MSDN lists a plain "int", so I replaced "INT" by "int" to make things clearer.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@435 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:27:24 +00:00
Maarten ter Huurne 4b3c4492ea Replaced "WORD" by "u16", except where it is part of the Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@434 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-03 00:12:32 +00:00
Maarten ter Huurne 1154027808 Replaced type "DWORD" by "u32", except where "DWORD" is used to access the Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@429 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-09-01 22:48:56 +00:00
Maarten ter Huurne 9a7b828eba Removed function FilterDown(), which was neither used nor implemented.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@412 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 21:52:28 +00:00
Maarten ter Huurne d4db1a6657 Changed BYTE* to u8* after all, since these pointers are not directly related to Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@411 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 21:49:57 +00:00
Maarten ter Huurne 0bebbcb5f4 Replaced type "BYTE" by "u8", except where "BYTE" is used to access the Windows API.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@408 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 14:32:35 +00:00
hrydgard 09406d76c4 Fix/workaround at least one class of buffer underruns in the GL plugin. Fix some bad deletes (instead of delete []). etc.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@404 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-31 13:36:52 +00:00
hrydgard e5deb10714 bugfix the texcache bugfixes :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@395 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 23:15:11 +00:00
hrydgard 20d0c53781 Fix same texcache bug on DX side
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@394 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 23:06:40 +00:00
hrydgard 005cbbb379 Basic VBA-style save state system implemented - kb shortcuts only working on Windows. Keyboard shortcut system added. More cleanup in GFX plugins.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@390 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 22:06:53 +00:00
hrydgard 85565688d7 New SaveState folder for states. Removed some outdated code. Removed an unnecessary level of indirection for plugin calls. Assorted cleanup.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@389 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 19:19:40 +00:00
hrydgard e4825be7a8 more statesave bugfixes...
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@387 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 16:24:45 +00:00
hrydgard 4608333a56 State saving progress. Most core state seems to be saved/loaded correctly, not so for video yet unfortunately.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@386 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 16:05:32 +00:00
hrydgard ff0a613427 Cleaning up XK's mess, added a simple profiler, minor disasm fix. Too lazy to split it up into individual changes. Savestates not yet working.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@381 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-30 12:11:25 +00:00
XTra.KrazzY 2e760d69fe Added save/load state support in the UI
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@375 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 21:30:13 +00:00
XTra.KrazzY 051c2e0784 A lot of save state groundwork. Please notify if compilation breaks because
I haven't compiled


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@368 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-28 07:58:04 +00:00
XTra.KrazzY cb43ed49cd Small warning fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@360 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 12:44:22 +00:00
daco65 794f656188 fixed Video_SaveState & Video_LoadState in OGL/DX that made dolphin unable to load the plugins
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@352 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 11:45:51 +00:00
XTra.KrazzY a0ae17c5ff Fixed message box calls (they aren't even necessary, just checking whether the saving made it into the VideoCommon library
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@345 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-27 10:01:46 +00:00
XTra.KrazzY 7a2cdef912 Preliminary video save state support. More work is necessary, this is just some infrastructure for inter-project communication.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@332 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:40:18 +00:00
Maarten ter Huurne 734586a0ab Include system headers using "#include <file.h>", so GCC will not issue warnings about them.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@331 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:32:54 +00:00
XTra.KrazzY 60a5a592f9 A little housekeeping on Vertex Shader in DX9. Pending more work but my shader code is still too buggy to commit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@330 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-26 23:11:15 +00:00
hrydgard f44a06465a Change some project settings. Reorganize the symbol database code, step 1/2.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@292 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 15:46:08 +00:00
XTra.KrazzY 98b9cfb2de TEV shader compilation bugfix
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@286 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-24 08:54:23 +00:00
masken ae5b59747a Turned on Warnings as Errors for all vcprojs. Fixed almost all of the warnings in win32. Added many SVN Ignore settings.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@283 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 15:28:24 +00:00
hrydgard f82bf2ae9a Lots of FP hacking for little gain, super monkey ball is only slightly more sane (wow, it rhymed). Temporary no-speed-limit hack: Hold TAB.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@279 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 09:20:36 +00:00
Sonicadvance1 6e3069f99e Should fix Linux building, also adds GL/DX to the title in their respective plugins when in use
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@275 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-23 03:48:40 +00:00
hrydgard 3ef0eb979d Move some code out of the plugins into VideoCommon. No functional change.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@255 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-21 17:49:06 +00:00
hrydgard 683ba7ecae Minor speedup in texdecoder. More informative fifo error messages.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@249 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-20 18:31:48 +00:00
hrydgard f2b45beb90 Attempting to close the display window should not exit the emulator.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@248 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-20 18:30:11 +00:00
Shawn Hoffman e84721b13b fix for fullscreen for both video plugins in windows
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@243 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-20 08:01:27 +00:00
NunoRamiro 8c132bdae5 - Fixed: Crash when loading a rom with an unknown file extension.
- Fixed: Crash when stopping a game.
- Improved: DirectX Plugin.

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@237 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-17 19:28:24 +00:00
hrydgard 9e15c51f9e Silly build fix, a slightly improved error message.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@212 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-14 22:01:07 +00:00
hrydgard b4d7ce0197 Some cleanup, extracted XFB convert code into VideoCommon, added non-activated support to gl plugin. + a minor bugfix with no effects seen so far in gl plugin :P
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@209 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-14 21:34:39 +00:00
hrydgard 870194db21 Attempt to fix recent D3D plugin issue. Fix bug in debugger *<:-)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@198 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-14 19:57:46 +00:00
gigaherz 0332ec742e - Added message queue to DX9 plugin.
- Added plugin interface function Video_AddMessage to both plugins and to the plugin specs.
 - Added handling of the Video_AddMessage interface export from the core side.
 - Added a print on Core::Init for testing purposes (might not be the best place).

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@176 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-10 21:34:22 +00:00
Shawn Hoffman 8e443bad3e update to the texture format overlay, thanks to giga (see issue 112)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@150 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-08 10:23:17 +00:00
Shawn Hoffman a44e94a594 added overlay that displays texture formats (thanks to gigaherz!)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@139 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-08-06 01:08:02 +00:00
fires.gc ea1bf8c51a minor bug fixes for opengl plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@67 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-23 16:20:12 +00:00
fires.gc 7f46d51aee removed VS2008 project files
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@45 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-21 19:40:53 +00:00
hrydgard 3c71be6100 Improved some error msgs, added preliminary memory view window, split plugin ini files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@42 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-21 18:42:44 +00:00
hrydgard 36f8b9751a Better error messages, Dolphin will create save directories if not present.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@37 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-20 21:20:22 +00:00
hrydgard 4175db3aa3 Show SVN revision in plugin title bars too.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@36 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-20 15:36:18 +00:00
fires.gc 7765b3f556 plugin projects fixes
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@33 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-20 13:46:29 +00:00
hrydgard 461077b1a1 More GFX plugin cleanup, still no visible changes.
New right-click popup menu in game list - allow editing patch files easily.


git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@31 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-20 12:26:32 +00:00
fires.gc 2c6baf9abb fixes for the video projects
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@28 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-19 09:57:42 +00:00
hrydgard b3c55018a6 More common things moved out from the GFX plugins. No visible changes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@27 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-18 19:33:55 +00:00
hrydgard 91ccda69ef Split a couple of huge files up, to make them easier to handle.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@24 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-17 21:09:18 +00:00
hrydgard 711b1e0016 Started to extract common parts of the two gfx plugins into a new library (VS2008 users, sorry :)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@22 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-17 20:29:04 +00:00
fires.gc 207bdcd60f removed xptheme.h from project
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@17 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-17 10:31:34 +00:00
fires.gc ceb924f398 added option "render to main window" to opengl video plugin
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@16 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-17 10:17:19 +00:00
fires.gc b503d023bc added an option to render directx video plugin inside the main frame
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@15 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-17 09:18:03 +00:00
hrydgard 009a452fbf VS2008 project files.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@14 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-16 22:19:06 +00:00
hrydgard ea934759e1 Mostly cleanup and some better crash messages. Also enabled partial block linking (see JitCache.cpp), should give a small speedup but may cause problems, please report!
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@12 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-16 20:50:16 +00:00
fires.gc 222d669d8b Added missing DebugFast define for several plugin projects and fixed minor bugs
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@10 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-16 12:17:20 +00:00
hrydgard cbb3c55641 Started backport of features from OpenGL to D3D plugins (no visible effects yet). Some minor cleanup and checks. Deleted unnecessary file from SVN.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@9 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-15 20:11:18 +00:00
fires.gc 982586cdc6 just some code cleanings
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@8 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-15 11:53:41 +00:00
hrydgard 775dc8a9c0 Initial megacommit.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4 8ced0084-cf51-0410-be5f-012b33b47a6e
2008-07-12 17:40:22 +00:00