Merge in changes from my local repo

apocalyptech / eschalon_utils

Eschalon Books I, II, and III Character and Map Editors

http://apocalyptech.com/eschalon/

GNU General Public License v2.0

8 stars 3 forks source link

Merge in changes from my local repo #7

Closed elliotkendall closed 10 years ago

elliotkendall commented 10 years ago

Ugh, I've been committing to my fork the last few days...

apocalyptech commented 10 years ago

I noticed this was still open - it looks like this code's been merged into the main branch, right? (Even if this particular changeset didn't get merged.) Can we close this out, or is there more to do in here?

elliotkendall commented 10 years ago

Yeah, sorry, this is merged. I just suck at git.