Modify NoteDisplay to work with Var "Player" and Var "Controller" in non-receptor arrow.
formatting operator<()
Merge pull request #329 from hanubeki/noteskin-var

Fix Var "Player" and Var "Controller" in non-receptor arrow.
pedantic spaces -> tabs commit
fix invalid CropTo commands mentioned in issue #326
Changed Common Error redir to not use Common Normal redir so changing Common Normal doesn't accidentally change Common Error.
Increment the version. Update the change log.
Clean up .gitignore. Organize by cateogry.
Merge pull request #334 from wolfman2000/wolf-clean-gitignore

Clean up .gitignore. Organize by cateogry.
Typo.
Merge pull request #333 from wolfman2000/wolf-version-b4b

Increment the version. Update the change log.
Update Niler's Japanese language files.
Fix compilation with --with-static-ffmpeg
Merge pull request #336 from lthls/fix-static-ffmpeg-build

Fix compilation with --with-static-ffmpeg
Merge pull request #335 from hanubeki/lang-ja

Update Niler's Japanese language files.
Version un-bump. A comes before B, Jason.
Add another .gitignore entry: linker files.
Revert "Preserve Steps of unknown Style."

This reverts commit 8edd929e24025d8b39aa337e950fe1ce227b459a.

This also updates the song cache.
Merge pull request #341 from wolfman2000/wolf-revert-style-preserve

Revert "Preserve Steps of unknown Style."
Merge branch 'master' of github.com:stepmania/stepmania

Dear git, please stop giving a fuck that my ProductInfo files are different; they're SUPPOSED to be.

Conflicts:
	Themes/_fallback/Languages/ja.ini
	Themes/default/Languages/ja.ini
(I had removed some entries from the file, and then hanubeki did what I used to do and updated niler's Japanese lang file)