Patch for /trunk/source/src/mc.h - manual fix of merge conflict

MathewWi / desmumewii

Automatically exported from code.google.com/p/desmumewii

GNU General Public License v3.0

0 stars 0 forks source link

Open GoogleCodeExporter opened 9 years ago

GoogleCodeExporter commented 9 years ago

last commit was a merge conflict that didn't get manually resolved. this just 
takes your commit and forces it.

Original issue reported on code.google.com by mega...@gmail.com on 12 Jun 2012 at 5:12

Attachments: