Resolve origin/dev into origin/master

codemonkey85 / PKMDS

A Pokémon save hacking library written in C++! (currently supports Gen V and limited portions of Gen III / VI)

The Unlicense

22 stars 5 forks source link

Resolve origin/dev into origin/master #16

Closed Alphadelta14 closed 10 years ago

Alphadelta14 commented 10 years ago

Cherry pick of 54af5e431280df6c01847843332a5eb51a68099a to a7ef75b6326639a17bf63481a4fdec9a5dbc7848 into master with minor merge conflict resolution. dev will become obsolete after this. Please delete dev and re-branch it off origin/master.

codemonkey85 commented 10 years ago

Wow, thanks @Alphadelta14 !