search

OutpostUniverse / OP2Archive

Console Application for examining, creating, and extracting files from Outpost 2 .vol and .clm archives.
https://wiki.outpost2.net/doku.php?id=outpost_2:helper_programs:op2archive
MIT License
1 stars 0 forks source link

Merge newest version of OP2Utility #22

Closed Brett208 closed 6 years ago

Brett208 commented 6 years ago

@DanRStevens if you are comfortable with these changes, it should allow merging #21. I think that I usually manually update OP2Utility in the master after merging the branch. Otherwise, I'm not sure that it updates.

-Brett

DanRStevens commented 6 years ago

Ok, I'm going to go ahead and merge this. I want to see if this has any effect on merging the other branch, which also updates the submodule to an even newer version. I suspect everything will just work out fine without any merge conflicts.