source: branches/1.4

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @5392   4 years ldelgass merge r5389 from trunk
(edit) @5391   4 years ldelgass sync with trunk
(edit) @5388   4 years ldelgass merge r5386 from trunk
(edit) @5385   4 years ldelgass merge 5372 from trunk
(edit) @5384   4 years ldelgass whitespace
(edit) @5382   4 years ldelgass cleanups to sync with trunk
(edit) @5370   4 years ldelgass merge r5367 from trunk
(edit) @5369   4 years ldelgass Merge r5365:5366,r5368 from trunk
(edit) @5362   4 years ldelgass merge r5354:5361 from trunk
(edit) @5352   4 years ldelgass merge r5350:5351 from trunk
(edit) @5349   4 years ldelgass merge r5347 from trunk
(edit) @5344   4 years ldelgass merge r5343 from trunk
(edit) @5338   4 years ldelgass merge r5333:5337 from trunk
(edit) @5332   4 years ldelgass merge r5330:5331 from trunk
(edit) @5324   4 years ldelgass merge r5323 from trunk
(edit) @5322   4 years ldelgass merge r5320 from trunk
(edit) @5319   4 years ldelgass merge r5317 from trunk
(edit) @5310   5 years ldelgass merge r5308 from trunk
(edit) @5307   5 years ldelgass merge r5305 from trunk
(edit) @5301   5 years ldelgass Revert change from r4662, this isn't needed since setting the value of …
(edit) @5300   5 years ldelgass whitespace
(edit) @5299   5 years ldelgass Roll back widget/settings partial refactor in nanovis viewer. We can …
(edit) @5296   5 years ldelgass whitespace
(edit) @5295   5 years ldelgass whitespace
(edit) @5293   5 years ldelgass merge r5292 from trunk
(edit) @5291   5 years ldelgass merge r5289 from trunk
(edit) @5288   5 years ldelgass Bring volume settings tab look in line with trunk. Also, disable …
(edit) @5286   5 years ldelgass whitespace
(edit) @5285   5 years ldelgass whitespace
(edit) @5283   5 years ldelgass merge r3899,r3901 from trunk
(edit) @5282   5 years ldelgass whitespace
(edit) @5278   5 years ldelgass merge r5276 from trunk
(edit) @5275   5 years ldelgass merge r5258,r5270,r5274 from trunk
(edit) @5265   5 years ldelgass merge r5264 from trunk
(edit) @5263   5 years ldelgass merge r5259 from trunk
(edit) @5262   5 years ldelgass merge r5261 from trunk
(edit) @5253   5 years ldelgass merge r5252 from trunk
(edit) @5248   5 years ldelgass merge r5247 from trunk
(edit) @5247   5 years ldelgass merge r5231 from trunk (ws)
(edit) @5244   5 years ldelgass sync with 1.3 branch
(edit) @5238   5 years ldelgass sync with trunk
(edit) @5235   5 years ldelgass whitespace
(edit) @5232   5 years ldelgass mergeinfo
(edit) @5227   5 years ldelgass cleanup
(edit) @5226   5 years ldelgass whitespace
(edit) @5213   5 years ldelgass merge r5207 from trunk
(edit) @5212   5 years ldelgass merge r5210:5211 from trunk
(edit) @5209   5 years ldelgass merge r5208 from trunk
(edit) @5206   5 years ldelgass merge r5195 from trunk
(edit) @5204   5 years ldelgass merge r5202 from trunk
(edit) @5203   5 years ldelgass sync with trunk (use cutplanes visible command in nanovis)
(edit) @5198   5 years ldelgass merge r5196 from trunk (tls/bugreport fix)
Diff Rev Age Author Log Message
(edit) @5185   5 years ldelgass s/wmap/amap/
Diff Rev Age Author Log Message
(edit) @5174   5 years ldelgass merge r5158:r5160 from trunk
(edit) @5173   5 years ldelgass merge r5157 from trunk
(edit) @5172   5 years ldelgass merge r5156 from trunk
(edit) @5171   5 years ldelgass merge r5150 from trunk
(edit) @5146   5 years ldelgass merge r5145 from trunk
(edit) @5144   5 years ldelgass merge r4776 from trunk
(edit) @5143   5 years ldelgass Merge r5134:5135,r5137:5141 from trunk
(edit) @5133   5 years ldelgass sync with trunk
(edit) @5131   5 years ldelgass fixup merge error
(edit) @5130   5 years ldelgass Merge r4692 from trunk with modification: only print error message …
(edit) @5129   5 years ldelgass merge r4168,r5126:5128 from trunk
(edit) @5116   5 years ldelgass merge r5028 from trunk (sidebar insert tab)
(edit) @5101   5 years ldelgass whitespace
(edit) @5096   5 years ldelgass merge r5068:r5069 from trunk
(edit) @5095   5 years ldelgass merge r5090:r5094 from trunk
(edit) @5089   5 years dkearney merging r5085 from trunk to branch 1.4 (gauge use -font flag)
(edit) @5079   5 years ldelgass merge r5071,r5077:5078 from trunk (isosurface viewer)
(edit) @5063   5 years ldelgass merge r5062 from trunk
(edit) @5061   5 years ldelgass merge r5025 from trunk
(edit) @5060   5 years ldelgass merge r5044,r5056 from trunk
(edit) @5057   5 years ldelgass Merge isosurface viewer changes from trunk (r4993,r5054)
(edit) @5039   5 years ldelgass merge r5024 from trunk
(edit) @5021   5 years ldelgass merge r5019 from trunk (Img package workaround)
(edit) @5018   5 years ldelgass whitespace
(edit) @5016   5 years ldelgass merge r5015 from trunk
(edit) @5010   5 years ldelgass merge r4997 from trunk
(edit) @5007   5 years ldelgass merge -r4998:r5006 from trunk (whitespace)
(edit) @4988   5 years ldelgass sync minor change from trunk
(edit) @4987   5 years ldelgass remove dead code
(edit) @4985   5 years ldelgass merge r4972 from trunk
(edit) @4984   5 years ldelgass merge r4970 from trunk
(edit) @4981   5 years ldelgass merge r4979 from trunk
(edit) @4969   5 years ldelgass merge r4967 from trunk
(edit) @4966   5 years ldelgass merge r4964 from trunk
(edit) @4963   5 years ldelgass Merge r4959,r4961 from trunk
(edit) @4945   5 years ldelgass merge r4944 from trunk (typo)
(edit) @4943   5 years ldelgass merge r4928 from 1.3 branch (remove updates)
(edit) @4941   5 years ldelgass merge r4927 from 1.3 branch (fix 1D cloud+field)
(edit) @4939   5 years ldelgass merge r4918,r4921-4922 from 1.3 branch (recolor)
(edit) @4926   5 years ldelgass merge r4924 from trunk
(edit) @4864   5 years ldelgass merge r4856 from trunk to 1.4 branch
(edit) @4863   5 years ldelgass merge r4834 from trunk
(edit) @4862   5 years ldelgass merge r4849 from 1.3 branch (remove -simulate flag
(edit) @4846   5 years ldelgass set version to 1.4
(copy) @4845   5 years ldelgass start 1.4 branch based on 1.3 branch head
Note: See TracRevisionLog for help on using the revision log.