search

kgehmlich / coen390-team-d

A heartrate monitoring app for firefighters
0 stars 0 forks source link

Incorporate new UI into Bluetooth development #12

Closed kgehmlich closed 7 years ago

kgehmlich commented 7 years ago

The new UI (merged into master in pull request #11) must be incorporated into the bluetooth development. Merging here to test and refine before merging back into master.

kgehmlich commented 7 years ago

Conflicts resolved, although code will likely not compile (there are still references to nonexistent Views). Code will be fully merged (i.e. made functional) in the next commit.