ShuriZma
/
stella
mirror of https://github.com/stella-emu/stella.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,656 Commits 39 Branches 113 Tags 83 MiB
Commit Graph

253 Commits

Author SHA1 Message Date
thrust26 14330ac19d links added and fixed 2017-12-06 17:44:14 +01:00
thrust26 ec5a3cdec5 thumb.trapfatal added to developer settings dialog 
restructured developer settings dialog
duplicated debug colors are changed automatically
updated doc and screenshots accordingly
 2017-12-06 12:15:16 +01:00
thrust26 0afd6b44d0 'Contents' and links do added debugger documentation 
some debugger doc updates
 2017-12-04 11:02:36 +01:00
thrust26 faf9294fd2 a very little fix here an there 2017-12-03 09:08:33 +01:00
thrust26 591506cc93 minor updates for dump and rewind/unwind 2017-12-02 11:48:34 +01:00
thrust26 1341f07a36 trap doc updated 
double spaces after . removed
 2017-12-02 11:34:58 +01:00
thrust26 30cb1fe14d RewindManager fix for ROM startup rewind 
-bankrandom support for E7(8K) added
 2017-11-28 23:20:06 +01:00
thrust26 247cac9233 Minor spelling fixes 2017-11-28 22:08:16 +01:00
thrust26 5760167f31 E78K added to doc 
missing files added
 2017-11-27 22:51:41 +01:00
thrust26 bcc2f3a463 updated doc of supported bankswitching types 2017-11-27 17:08:41 +01:00
thrust26 177e388fb6 size of keyboard image reduced 2017-11-26 19:01:21 +01:00
thrust26 f2f3d79847 rewind keys documented 
keyboard layout added
 2017-11-26 18:39:37 +01:00
thrust26 e6c64627be minor doc updates 2017-11-26 16:26:21 +01:00
thrust26 c1fc60a4e0 missing files added 
first changes to debugger docs
 2017-11-26 13:42:56 +01:00
thrust26 9cb1280a37 more doc updates 2017-11-26 12:01:49 +01:00
thrust26 1e82d107ee documentation for "Developer Settings" started 2017-11-26 10:15:33 +01:00
thrust26 6bc35b45de started to document the developer options dialog and commandline parameters. 2017-11-25 12:32:46 +01:00
thrust26 3dcec2e705 minor doc fixes 2017-11-25 11:12:37 +01:00
thrust26 d6680a681f made "color loss", "stats" and "grab mouse" hotkey toggles temporary only 
added messages for "grab mouse" toggle
updates doc for "grab mouse" toggle
 2017-11-23 22:13:37 +01:00
Stephen Anthony 628f981121 Various cleanups to documentation and snapshots: 
- Changelog updated for recent fixed from Thomas J.
- Minor formatting fixes in TIASurface class
- Updated documentation for 'ss1x' mode; snapshots now have only scaling disabled, not effects removed
- Updated snapshots for change in ss1x, and also ran them all through pngcrush, to optimize size
 2017-09-18 19:50:37 -02:30
Stephen Anthony 21bf401836 Commandline arguments 'holdxxx' now work correctly (fixes #209). 2017-08-22 14:15:30 -02:30
Stephen Anthony b608c5bf88 Updates for 5.0.2 release. 2017-08-19 20:34:00 -02:30
Stephen Anthony d92566ad40 Updated docs for threading. 2017-08-15 17:57:27 -02:30
Stephen Anthony 24e55baa2c Expose 'threads' option through the Video Settings -> General UI. 2017-08-15 10:58:19 -02:30
Stephen Anthony b35f43d41f Updated various documentation screenshots. 
- Some of them contained a cursor (thanks Thomas :)), and others
were not as neat as they could be (missing edges, etc)
 2017-08-02 16:58:13 -02:30
Stephen Anthony d22ed691b5 Updated PointingDevice (trakball and friends) 
- changed from templates back to inheritance (sorry DirtyHairy :))
 - added 'tsense' commandline argument and associated UI
 - updated docs and screenshots for new functionality
 2017-08-02 16:07:02 -02:30
Stephen Anthony 369c426f33 Updated documentation for typo concerning dsense and msense. 
Also add tsense, which I'm currently working on.
 2017-08-01 12:36:33 -02:30
Stephen Anthony 1677ecae12 Make it clear that Alt-l keyboard shortcut is an 'L', not a one. 2017-07-26 16:16:06 -02:30
Stephen Anthony 11ee61e351 Updated docs concerning phosphor blend usage. 2017-07-25 14:32:02 -02:30
Stephen Anthony 00afc8ea4f Final updates for 5.0.1 release. 2017-07-23 12:33:16 -02:30
Stephen Anthony 7c2da9512d Updated OSX project file for C++14 changes. 2017-07-21 21:43:47 -02:30
Stephen Anthony 5c114e69d2 Fixed documentation type as reported on AtariAge. 2017-07-21 21:04:20 -02:30
Stephen Anthony d74bbba4f9 Updated documentation and screenshots. 2017-07-14 22:39:49 -02:30
Stephen Anthony d9f52599dc Marked BUS scheme as experimental per authors request. 2017-07-12 18:07:40 -02:30
Stephen Anthony d613173cd7 The default phosphor blend level can now be set globally (fixes #144). 
Added new 'tv.phosphor' commandline argument to accomplish the above,
and associated UI item in Video Settings.

Updated docs for 'tv.phosphor' and 'tia.debugcolors'.  More work is
needed on this, since I need to add screenshots for this new functionality.
 2017-07-09 22:40:06 -02:30
Christian Speckner aa5be284cb Add a note on ystart autodetection. 2017-07-10 00:49:09 +02:00
Stephen Anthony e1bc5c92e4 Trakball documentation fixes and other minor updates (from issue #164). 2017-07-06 19:30:11 -02:30
Stephen Anthony 5dbd9fee51 Some changes to phosphor blending: 
- Updated default phosphor blend to '30'.
 - Added shortcut keys Alt-i and Alt-o to decrease/increase phosphor
blend mode dynamically, while a ROM is running.
 - Made range of blending 0 - 100.
 2017-05-29 10:49:50 -02:30
Stephen Anthony 1da8e2d388 Updated changelog and docs for new bankswitching schemes. 2017-03-24 18:10:40 -02:30
Stephen Anthony e133a4a521 Updated documentation for recent trakball naming changes. 2017-02-11 22:04:40 -03:30
Stephen Anthony d99f83580f Updated Linux/UNIX port to use XDG_CONFIG_HOME for storing settings 
file.  For most people, that means the files are now stored in
'~/.config/stella' instead of '~/.stella'.  Manually moving the directory
will be necessary if you wish to keep the old settings.
 2017-01-28 19:14:11 -03:30
Stephen Anthony 6c73c11961 Updated OSX project to always use internal zlib library, 
and changed the preferences file to 'Stella-emu.plist'.
 2017-01-15 17:38:27 -03:30
Stephen Anthony 5f5ea1f424 Oops, some documentation deletions were somehow reverted. 2016-12-31 22:04:27 -03:30
Stephen Anthony 8815a6f027 Updated all references to new stella-emu webpage. 2016-12-31 17:19:29 -03:30
Stephen Anthony 072015c82a Removed toggling of displaying HMOVE blanks. With the old core, what 
it drew in that area was sometimes garbage, and with the new core it
draws nothing at all (which is the correct behaviour).  Hence the
feature is obsolete.
 2016-12-06 16:36:04 -03:30
stephena 81844dbf7f Preparing for 4.7.3 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3319 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-11-20 21:13:42 +00:00
stephena 7903c52406 Documentation updates for 4.7.2 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3297 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-03-25 20:51:28 +00:00
stephena f3fce85633 Re-added CTY scheme to the list of selectable bankswitch schemes, 
and fixed some minor warnings generated from GCC 6.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3294 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-03-05 18:35:25 +00:00
stephena 1b223368e6 Updated UI to be able to change TV jitter effect and recovery time. 
Updated various files for 4.7.1 release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3279 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-02-13 01:21:28 +00:00
stephena 7e1e3f0b31 Changed description of tv.jitter to not mention scanlines. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3277 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-02-12 14:28:30 +00:00
stephena 86c7b229f0 Final commit for 4.7 release, updating docs and some minor last-minute 
code cleanup.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3263 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-01-25 20:49:21 +00:00
stephena 143b22baec Added 'CV+' bankswitching scheme. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3253 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-01-23 17:58:00 +00:00
stephena 821f22c205 Updated documentation to mention potential issues with WinXP, and that 
WinXP support may be discontinued soon.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3252 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-01-22 22:21:25 +00:00
stephena b9d71634a7 Added ability to specify MouseAxis range from the UI, and send it to 
the Paddles class to be actually used.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3250 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2016-01-18 18:33:45 +00:00
stephena bfdaeadd55 Updated various files for next point release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3231 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-10-28 19:52:12 +00:00
stephena d36a3ce44b Updated files for 4.6.6 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3226 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-10-11 15:19:16 +00:00
stephena f5eca188ce And the process starts again. 
Added shortcut key to toggle TV scanline jittering, and have it default
to off.  I'd really like to enable it again eventually, or perhaps use some
of the code in the case where scanline jumps are *really* large (since it
seems to emulate the output for every TV I've ever seen).

Bumped version #.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3221 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-09-29 21:14:12 +00:00
stephena f367b3a9a6 Final commit for 4.6.5 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3219 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-09-25 23:08:08 +00:00
stephena 75acbe8aac Getting ready for the 4.6.5 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3212 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-09-21 13:27:25 +00:00
stephena 70e40a10c9 Updating various files for 4.6.5 release, sometime this month. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3197 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-09-09 16:58:41 +00:00
stephena 26e9f15b86 Changed 'hidecursor' to 'cursor', and allowed it to set cursor visibility 
for UI and emulation modes separately.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3179 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-06-28 18:16:33 +00:00
stephena 1c9de2abbd Final changes for 4.6.1 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3162 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-04-22 22:19:43 +00:00
stephena 439325e911 Update version # for upcoming release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3160 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-04-22 15:09:43 +00:00
stephena 651204df32 Final updates for 4.6 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3154 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-03-21 00:16:30 +00:00
stephena 26fcabc23c Getting a head-start on updating files for 4.6 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3145 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-02-06 16:42:24 +00:00
stephena 44ef06359a Forgot to add 'WD' scheme to the manual. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3132 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-01-01 04:02:06 +00:00
stephena abd4c9efa8 ZIP files now show nested files and directories instead of everything 
being compressed into one level.  In the process, moved all ZIP-related
functionality from OSystem into FSNodeZIP, since it's the only thing
that actually uses it.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3129 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2015-01-01 02:05:28 +00:00
stephena 4642183745 Expose 'ctrlcombo' through the UI. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3120 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-12-24 18:49:26 +00:00
stephena 7f321a9628 The 'listdelay' option now allows 0, meaning to completely disable list-skipping. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3119 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-12-24 18:17:00 +00:00
stephena 0d5ae3acf5 Added ability to save continuous snapshots per frame to Shift-Alt-s. 
Eventually this may lead to proper movie output.  Thanks to SvOlli
for the code.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3087 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-11-19 00:03:11 +00:00
stephena 2095b29873 Updated docs for C++11 requirements. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3067 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-11-10 16:55:01 +00:00
stephena 6d753fd335 CPU registers can be selectively randomized with cpurandom option. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3014 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-10-23 15:52:39 +00:00
stephena c21220ce2c Joysticks are now detected dynamically, meaning that they can be added/removed 
while the emulator is running.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@3002 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-10-13 22:37:15 +00:00
stephena 9ac1244706 Updates for 4.1.1 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2995 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-09-14 19:58:37 +00:00
stephena 4b6f589a4e Re-added 'uipalette' option. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2989 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-09-03 13:27:33 +00:00
stephena f9f423bf25 Fixed bug in 'MDM' debugger tab; it was always showing bank 0. 
Updated docs for upcoming 4.1 release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2983 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-08-31 23:16:57 +00:00
stephena e9a0bee314 Forgot to add info for 'MDM' in last commit. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2976 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-08-14 14:04:05 +00:00
stephena 4bc632644c Updated docs and changelog for DASH improvements. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2972 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-07-31 23:46:01 +00:00
stephena 21339641d5 Updated documentation for 4.0 changes. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2943 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-06-30 19:52:19 +00:00
stephena 23a2e2d7ee More documentation updates. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2933 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-06-21 01:45:23 +00:00
stephena 9956dff54a Starting to update docs and misc text files for 4.0 release. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2932 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-06-20 23:38:19 +00:00
stephena 80bbfadb4c Fixed grabmouse and show cursor to match Stella 3.9.3 functionality. 
Added 'hidecursor' commandline option, to always disable showing the
mouse cursor (useful for fullscreen-only frontends).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2908 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-06-04 16:01:45 +00:00
stephena e81f2b0ffd Added preliminary support for DASH bankswitching scheme by A. Davie. 
This hasn't been tested yet, since no ROMs currently exist.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2895 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-06-02 20:41:19 +00:00
stephena 8f2123a5bf Aspect ratio correction is now properly applied to the TIA in windowed 
and (simulated) fullscreen mode.

Fullscreen mode is now simulated in that it creates a window that matches
what would appear in fullscreen.  The next thing to do is actually have
the backend create this fullscreen mode correctly.

Changed 'gl_fsscale' to 'tia.fsfill' to more properly indicate what the
option does.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2894 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-06-02 14:34:12 +00:00
stephena 0c3b9f1443 OK, just checking in to let everyone know that I haven't abandoned the SDL2 
conversion.

There are changes all over the FrameBuffer classes.  Still TODO is
TIA resizing in windowed mode, and all fullscreen modes.  The infrastructure
is close to completion, and it should be pretty easy to get the framebuffer
stuff done in the next week or so.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2876 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-04-28 16:47:10 +00:00
stephena bc9e50f0f1 Updated some documentation. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2873 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-03-12 16:56:15 +00:00
stephena a58fb7165e The 'center' and 'vsync' options are now honoured. Many commandline 
options have changed names.  In particular, all tia-related options
now start with 'tia.'.  This includes most of the old options that
started with 'gl_'.

Changed the names of all tv-effects options from starting with 'tv_'
to 'tv.', to match the name changes elsewhere.

Some work on the documentation to reflect the latest changes.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2858 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-02-28 21:21:50 +00:00
stephena 37b30e7b66 Some cleanups of the FrameBuffer class; 'uipalette' is no longer suported. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2845 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-01-31 16:23:10 +00:00
stephena 53c053a2d9 Ported 3.9.3 changes to trunk. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2844 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2014-01-20 21:02:20 +00:00
stephena 963c5d621b Changed 'dbg.boldfont' to dbg.fontstyle', which allows to use a combination 
of bold and normal fonts within the debugger UI.  Because of the # of changes
this requires, this is as far as I'll willing to go with UI configurability.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2820 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-08-26 13:01:29 +00:00
stephena ecacdcf5f2 The 'usemouse' option now allows to use the mouse as a controller 
only for analog-type devices (paddle, trackball, etc).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2819 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-08-24 18:40:02 +00:00
stephena 8aa736b35a Added ability to use bold fonts in the debugger. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2816 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-08-24 15:51:37 +00:00
stephena ae4e87a51c Added ability to start directly in the debugger to 'Power-on options'. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2809 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-08-20 20:48:58 +00:00
stephena 893bfd4a41 Override properties dialog is now called 'Power-on options', and includes 
extended abilities (see changelog and docs for more info).


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2783 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-08-09 13:09:47 +00:00
stephena 8f8c85250c Preparation for 3.9 release, updated documentation. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2756 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-06-26 16:03:08 +00:00
stephena 5c4b6defd9 Added properties info for "Extra Terrestrials", and bumped version # 
for 3.8.1 release.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2648 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-03-03 21:05:43 +00:00
stephena 0650c48977 Implemented TIA RSYNC write functionality thanks to Omegamatrix. 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2626 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-02-24 01:46:14 +00:00
stephena 6279c24b57 Renamed 'eepromdir' option to 'nvramdir', and have it default to 
'BASEDIR'/nvram.  Previously it defaulted to BASEDIR, which was getting
filled with many such files.

Unfortunely, all files will have to moved manually, but it's an easy
one-time operation.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2613 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-02-17 00:19:14 +00:00
stephena c11c7724ad Added ability to specify separate directories for saving 
and loading snapshot files.


git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2612 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-02-16 19:56:09 +00:00
stephena a5cb67551f Final updates to the sound code (resampling seems to be working fine). 
git-svn-id: svn://svn.code.sf.net/p/stella/code/trunk@2585 8b62c5a3-ac7e-4cc8-8f21-d9a121418aba
 2013-01-27 15:08:04 +00:00