Matthew Territo 08711e7c2e Merge commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00' into feature/websocketnavigation ...

* commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00':
  Adapt to UniformCache changes when updating uniform locations (closes #648)
  General cleanup Adapt to changes in Ghoul Make use of TextureManager Jenkins compile fix
  Fix setting of FixedRotation values through assets (closes #647)
  Enable OrVerifier and AndVerifier to have an arbritrary (>=2) number of verifiers Make specifying the line number in TLETranslation optional
  Add warning when targets are not registered in the convert-table for image projections

2018-07-19 17:36:53 -06:00

..

openspace

Merge commit 'f55828198f0ba93da0c1258bb73fcca8adf66e00' into feature/websocketnavigation

2018-07-19 17:36:53 -06:00