[fofix-commits] [stump/fofix] e2ab14: Merge-back of changes from git:

[noreply at github.com]

Branch: refs/heads/trunk
Home:   http://github.com/stump/fofix

Commit: e2ab145a38d6d3a7d72ddf05ce06b154fc8453fb
    http://github.com/stump/fofix/commit/e2ab145a38d6d3a7d72ddf05ce06b154fc8453fb
Author: John Stumpo <stump at jstump.com>
Date:   2010-03-01 (Mon, 01 Mar 2010)

Changed paths:
  M src/AnimationPlayerTest.py
  M src/DialogTest.py
  R src/Engine.py
  R src/EngineTest.py
  M src/FoFiX.py
  M src/GameEngine.py
  M src/GameEngineTest.py
  M src/Language.py
  M src/Log.py
  M src/MenuTest.py
  M src/Resource.py
  M src/ResourceTest.py
  M src/Settings.py
  M src/Song.py
  M src/SongTest.py
  R src/SvgColors.py
  M src/SvgTest.py
  M src/VFS.py
  M src/Version.py
  M src/VideoPlayerTest.py
  M src/ViewTest.py
  R src/launcher.sh
  R src/locale.py
  R src/rgb2py.py
  M src/scripts/module-updateAllFoFiXSVNsRelative.bat
  R src/setup.orig.py
  M src/setup.py
  R src/setup_exe.py
  R src/setup_mac.py
  R src/svg2png.py
  R src/svntag.py

Log Message:
-----------
Merge-back of changes from git:

diff from svn    (2ad31cb128af01aaff10030282bf12c1b34681db)
       to master (eedd04100703b75f820a11b912d797eb2deb5dfb)

Highlights:
  - Remove unnecessary remnants of removed/obsolete things, like
    the last vestiges of SVG supporting code, the launcher script,
    and our copy of the locale module (part of the standard
    library now).
  - Refactor all of the setup*.py scripts into one.
  - Support detecting revision information from either git or svn.
  - Use named constants from Version.py rather than accessor
    methods for information for which it makes sense.
  - Merge Engine into GameEngine.



git-svn-id: http://fofix.googlecode.com/svn/MFH-Mod/trunk@2037 48f48816-a574-47fe-9a59-6914b3aef992


Commit: 044afee56673ca1c3b6371944fdefc76b8b6e829
    http://github.com/stump/fofix/commit/044afee56673ca1c3b6371944fdefc76b8b6e829
Author: John Stumpo <stump at jstump.com>
Date:   2010-03-01 (Mon, 01 Mar 2010)

Changed paths:
  A .gitignore

Log Message:
-----------
Get things that were missed in the previous commit.

(After a week of using only git, it's too easy to forget that svn only commits the changes under the subdir you actually run "svn commit" in...)



git-svn-id: http://fofix.googlecode.com/svn/MFH-Mod/trunk@2038 48f48816-a574-47fe-9a59-6914b3aef992