09-05-2013, 11:15 AM -
great number of changes good work
Merge remote-tracking branch 'upstream/master'
Conflicts:
rpcs3/Emu/GS/GL/GLGSRender.cpp
rpcs3/Gui/InterpreterDisAsm.cpp
rpcs3/Gui/MainFrame.cpp
117 changed files with 10,996 additions and 2,523 deletions.
Refactor of game loading
1 changed file with 20 additions and 50 deletions.
Update .gitignore
1 changed file with 1 addition and 2 deletions.
Fix more spelling mistakes
4 changed files with 13 additions and 13 deletions.
Merge pull request #2 from cornytrace/master
Several small improvements
18 changed files with 205 additions and 118 deletions.
Merge remote-tracking branch 'upstream/master'
Conflicts:
rpcs3/Emu/GS/GL/GLGSRender.cpp
rpcs3/Gui/InterpreterDisAsm.cpp
rpcs3/Gui/MainFrame.cpp
117 changed files with 10,996 additions and 2,523 deletions.
Refactor of game loading
1 changed file with 20 additions and 50 deletions.
Update .gitignore
1 changed file with 1 addition and 2 deletions.
Fix more spelling mistakes
4 changed files with 13 additions and 13 deletions.
Merge pull request #2 from cornytrace/master
Several small improvements
18 changed files with 205 additions and 118 deletions.