[fofix-commits] [stump/fofix] 4b9b21: kdiff3 .orig files

[noreply at github.com]

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

Commit: 4b9b217ba143061b0a4abe5e8a44b10dc3b20ca6
    http://github.com/stump/fofix/commit/4b9b217ba143061b0a4abe5e8a44b10dc3b20ca6
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-17 (Sun, 17 Oct 2010)

Changed paths:
  M .gitignore

Log Message:
-----------
kdiff3 .orig files


Commit: 630d2d59e2f30b5d3c7d9e88c9ed568288709fd9
    http://github.com/stump/fofix/commit/630d2d59e2f30b5d3c7d9e88c9ed568288709fd9
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-17 (Sun, 17 Oct 2010)

Changed paths:
  M src/Input.py
  M src/Player.py
  M src/Settings.py

Log Message:
-----------
Revert "Remove nonfuntional key conflict code" - not as nonfuntional as I though.

This reverts commit 8774e6a73ab43c3139c28b2ce9a94ff784d267ea.


Commit: 0b23e5f7de8636c968b10a2c999994324c98f4cb
    http://github.com/stump/fofix/commit/0b23e5f7de8636c968b10a2c999994324c98f4cb
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-17 (Sun, 17 Oct 2010)

Changed paths:
  M doc/RunningFromSource.mkd

Log Message:
-----------
bump python minor version


Commit: bfcd3eed739a4a66e8b9cff942289b6ab0ceda68
    http://github.com/stump/fofix/commit/bfcd3eed739a4a66e8b9cff942289b6ab0ceda68
Author: fuzion <fuzion at nukeit.org>
Date:   2010-10-17 (Sun, 17 Oct 2010)

Changed paths:
  M doc/RunningFromSource.mkd
  M src/Input.py
  M src/Player.py
  M src/Settings.py

Log Message:
-----------
Merge branch 'master' into i18n_unicode