search

EschatonOptimizers / Cataclysm-DDA

Cataclysm - Dark Days Ahead. A fork/variant of Cataclysm Roguelike by Whales.
http://en.cataclysmdda.com/
0 stars 0 forks source link

upstream merging #12

Open CIB opened 11 years ago

CIB commented 11 years ago

Let's use this issue to track the upstream version we're on. Whenever merging/planning to merge, we can post here the commit hash we're moving to.

CIB commented 11 years ago

Current version is f9073b9

atomicdryad commented 11 years ago

If you've tested upstream past current point and it's not massively broken, merge should be okay. There's a big options refactor pr'ed atm, btw.

As far as branches here, should master be used for non-wip? Testing for debug spewing wippy madness