source: branches/1.4

Revision Log Mode:


Legend:

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