[fofix-commits] [stump/fofix] a18a2f: Merge branch 'master' into origin/master

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/stump/fofix

Commit: a18a2f366fe252f62eb0af10a9e2778c2c5b945c
    https://github.com/stump/fofix/commit/a18a2f366fe252f62eb0af10a9e2778c2c5b945c
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-11-15 (Mon, 15 Nov 2010)

Changed paths:
  M data/themes/MegaLight V4/rockmeter.ini
  M doc/RunningFromSource.mkd
  M src/Guitar.py
  M src/Instrument.py
  M src/Neck.py
  M src/Rockmeter.py
  M src/setup.py

Log Message:
-----------
Merge branch 'master' into origin/master


Commit: 6d55df53419c9cce6b306ecd0c2e4a1be2851915
    https://github.com/stump/fofix/commit/6d55df53419c9cce6b306ecd0c2e4a1be2851915
Author: weirdpeople <matthewsitton at gmail.com>
Date:   2010-11-15 (Mon, 15 Nov 2010)

Changed paths:
  M src/Drum.py
  M src/GameEngine.py
  M src/Guitar.py

Log Message:
-----------
Merge branch 'origin/master'