sli-fox / jamms

Apache License 2.0
3 stars 1 forks source link

Redid all GUI decoupling for tower #117

Closed sli-fox closed 9 years ago

sli-fox commented 9 years ago

Hey everyone,

Again, if anyone is doing any merge conflict resolution and then pushing as a pull request PLEASE DOUBLE CHECK THAT YOU'RE NOT OVERRIDING EXISTING CHANGES.

I just had to redo all of the GUI decoupling for tower that I had previously pushed, which, obviously, wasn't something I wanted to do the night before the final demo.

Pull request #106 undid and overwrote all of the decoupling changes in Tower in pull request #105.

@markmssd @AjayAujla @mdubey2014 @jeremy091

ALSO, if anyone has time to help Mri and I with the final presentation... we're working on it now.

Steph