Merge branch 'feature/hererocks' into develop
commit6dff177a717167999449f843c08955d5b0c03255
authorThomas Harning Jr <harningt@gmail.com>
Thu, 4 Aug 2016 04:12:12 +0000 (4 00:12 -0400)
committerThomas Harning Jr <harningt@gmail.com>
Thu, 4 Aug 2016 04:12:12 +0000 (4 00:12 -0400)
tree396c72637ae0b7776836aa39514d30a8bb72576c
parent3995b7e2a2c98bed5b321163b45818805f002dc3
parent0b7ec6e4e813dc0983ba143023d6c5d7b7cc35a1
Merge branch 'feature/hererocks' into develop

* feature/hererocks:
  travis: update to use hererocks for version management