Commit Graph

2 Commits

Author SHA1 Message Date
Emmet Young ee3abe73a8 Merge branch 'master' of http://www.pj64-emu.com:8090/project64.development
Conflicts:
	Source/Project64/N64 System/Interpreter/Interpreter Ops.cpp
2012-10-01 00:52:47 +10:00
zilmar 7f0ada99fd cleaned up more config settings 2012-09-27 20:45:20 +10:00