Commit graph

5 commits

Author SHA1 Message Date
Nate Jensen
b21f03757a Omaha #3356 remove OBE register buddies from collaboration
Change-Id: I49099386a48b650c9e6ea1a96b519fbc178f769f

Former-commit-id: 8b55dfa980 [formerly b690c360ac] [formerly 8e74892cd6] [formerly 8b55dfa980 [formerly b690c360ac] [formerly 8e74892cd6] [formerly 40d4abe4cd [formerly 8e74892cd6 [formerly 89de611bd1abdd016ae8a96db4c820004c52b406]]]]
Former-commit-id: 40d4abe4cd
Former-commit-id: b4b5642b58 [formerly f78e7fe79c] [formerly fcfeaf6b76dea8640f9825d4afaf45c9001ac3e4 [formerly 5b2e410c6c]]
Former-commit-id: 967d00b58b43570744b7d6d9b09ff846327cd9f1 [formerly 54e9b04c3d]
Former-commit-id: 22fa9cc6d9
2014-09-03 10:00:11 -05:00
Ben Steffensmeier
d5503166ba Omaha #3163 Add support for reading colored text styles from future versions of collaboration.
Former-commit-id: e8f63b5d91 [formerly 08f7d7b8dd] [formerly 67e68732d6] [formerly e8f63b5d91 [formerly 08f7d7b8dd] [formerly 67e68732d6] [formerly 79ef4a5301 [formerly 67e68732d6 [formerly 63d4e9f1e2bf95792fa82d101ce59f23e2cbdaf9]]]]
Former-commit-id: 79ef4a5301
Former-commit-id: 936cc0e3b0 [formerly fcbd4cc9ee] [formerly 8a94a819b3a9d0b493c500cfbf25c7be2d344a10 [formerly 126f47f725]]
Former-commit-id: 3af146f89fd6d70f609c6321a81d9537015fc1c4 [formerly e38c19dd1d]
Former-commit-id: 3ade0c85eb
2014-05-16 12:50:48 -05:00
Ben Steffensmeier
18980e6a8c Issue #2817 Fix image reproject. Remove deprecated mesh reproject.
Former-commit-id: 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly 152980350c [formerly 780dc19fac] [formerly 70ae372303] [formerly e08d4f77c3 [formerly 70ae372303 [formerly 5e5c09b701d44e8cedcad273f301bcf92f5606ec]]]]
Former-commit-id: e08d4f77c3
Former-commit-id: d27c21b9f6 [formerly 7aca322faa] [formerly c293b1124e59af7c01e948de86093eee22fbb5d9 [formerly a6bf896593]]
Former-commit-id: 38003672caef259cf47e8867a401b32fc9add635 [formerly 7e29aa25a9]
Former-commit-id: 07ffe9f711
2014-02-21 17:37:19 -06:00
Max Schenkelberg
2dbe54cb4a Issue #2492 Added getDataUnit to IColormappedImage and implementing classes. Deprecated dataUnit methods in ColorMapParameters. Fixed colormap slider to work with data and colormap units differing.
Change-Id: Ic82f45447113425a08909be4c5229502882db022

Former-commit-id: 752c9574b4 [formerly 2f794486e3] [formerly e58a5df04b] [formerly 752c9574b4 [formerly 2f794486e3] [formerly e58a5df04b] [formerly bd903f6641 [formerly e58a5df04b [formerly 58ccc575973ea9a1778659e17daff8577747dec5]]]]
Former-commit-id: bd903f6641
Former-commit-id: ad9578db6f [formerly 3f3b244b0d] [formerly f684ed2d6192fd370d5f9876f88c4494c40afb31 [formerly c85532a180]]
Former-commit-id: 13938eba0ef04bbdaad219d1622f03eac1794f4a [formerly 60616f7ef0]
Former-commit-id: 7383be61c1
2013-11-11 11:09:00 -06:00
Steve Harris
8794e3b599 12.11.1-4 baseline
Former-commit-id: 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6e44abdba1 [formerly 98171b5de9] [formerly d3497e47eb] [formerly 6958b861f0 [formerly d3497e47eb [formerly dddf20c9518c578d1bebd0b5e01b10c5080fd24e]]]]
Former-commit-id: 6958b861f0
Former-commit-id: c9b563338a [formerly 2c82d9cb07] [formerly d50a176f97de36460cafeb5bb47f7dc824e33ce1 [formerly cbbdb231ce]]
Former-commit-id: 892afd7b093bec93e8f4c170f6b8ae08bea40239 [formerly 560f0d9cc3]
Former-commit-id: 35e34308c5
2012-10-16 13:27:07 -05:00