[fofix-commits] [stump/fofix] f0548a: Merge remote branch 'origin/master'

[noreply at github.com]

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

Commit: f0548a43d47e0d3ea47308dce5ad6a5ec62ed4cc
    http://github.com/stump/fofix/commit/f0548a43d47e0d3ea47308dce5ad6a5ec62ed4cc
Author: John Stumpo <stump at jstump.com>
Date:   2010-10-09 (Sat, 09 Oct 2010)

Changed paths:
  M .gitignore
  M src/AnimationPlayer.py
  M src/Guitar.py
  M src/Instrument.py
  M src/Menu.py
  M src/SongChoosingScene.py
  M src/Theme.py

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