source: branches/1.4

Revision Log Mode:


Legend:

Added
Modified
Copied or renamed
Diff Rev Age Author Log Message
(edit) @5794   9 years ldelgass merge r5792 from 1.3 branch
(edit) @5773   9 years ldelgass merge r5766:r5772 from trunk
(edit) @5766   9 years ldelgass Merge r5758:r5765 from trunk
(edit) @5758   9 years ldelgass merge r5757 from trunk
(edit) @5756   9 years ldelgass Merge r5736,r5747,r5754 from trunk
(edit) @5733   9 years ldelgass Merge in vtkvolume viewer updates from trunk
(edit) @5732   9 years ldelgass merge 5729 from trunk
(edit) @5731   9 years ldelgass merge r5730 from trunk
(edit) @5728   9 years ldelgass merge r5725:5726 from trunk
(edit) @5694   9 years ldelgass merge r5692:5693 from trunk (examples)
(edit) @5688   9 years ldelgass Sync with trunk
(edit) @5682   9 years ldelgass merge new Python examples from 1.3 branch (uq sync)
(edit) @5674   9 years ldelgass merge r5673 from trunk (eol-style)
(edit) @5671   9 years ldelgass merge r5670 from trunk
(edit) @5668   9 years ldelgass Merge pyxml fixes from r5652
(edit) @5666   9 years ldelgass Sync glyph viewer with trunk
(edit) @5665   9 years ldelgass merge r5662:5663 from trunk
(edit) @5660   9 years ldelgass Merge r5657:5659 from trunk (whitespace/style)
(edit) @5656   9 years ldelgass update mergeinfo
(edit) @5655   9 years ldelgass merge from trunk
(edit) @5651   9 years ldelgass merge r5649 from trunk (fix app-fermi Makefile)
(edit) @5643   9 years ldelgass merge r5642 from trunk
(edit) @5641   9 years ldelgass merge r5639:5640 from trunk
(edit) @5637   9 years ldelgass Merge r5632:5636 from trunk (mesh fixes)
(edit) @5631   9 years ldelgass merge r5629 from 1.3 branch
(edit) @5623   9 years ldelgass Add outline color to AdjustSettings? (sync with trunk)
(edit) @5622   9 years ldelgass Merge r5608:5612 from trunk (remove unirect blob format)
(edit) @5621   9 years ldelgass update mergeinfo
(edit) @5619   9 years ldelgass mergeinfo update
(edit) @5618   9 years ldelgass update mergeinfo
(edit) @5617   9 years ldelgass mergeinfo updates
(edit) @5616   9 years ldelgass Mergeing some cleanups from trunk
(edit) @5607   9 years ldelgass merge r5602 from 1.3 branch
(edit) @5601   9 years ldelgass merge r5599 from trunk
(edit) @5594   9 years ldelgass Merge r5581:5591 from trunk
(edit) @5593   9 years ldelgass Merge r5557:5561,r5574:5575 from 1.3 branch
(edit) @5580   9 years ldelgass merge r5563:5579 from trunk
(edit) @5567   9 years ldelgass Merge r5536:5541 from trunk
(edit) @5564   9 years ldelgass merge r5562 from trunk
(edit) @5556   9 years ldelgass Fix for initializing compoennt settings in nanovis viewer
(edit) @5535   9 years ldelgass merge r5526:5527 from trunk
(edit) @5522   9 years ldelgass merge r5520 from trunk
(edit) @5515   9 years ldelgass merge r5514 from trunk
(edit) @5513   9 years ldelgass whitespace
(edit) @5508   9 years ldelgass Sync glyph viewer with 1.3 branch
(edit) @5469   9 years ldelgass fix legend toggle in vtkvolume
(edit) @5465   9 years ldelgass backport some vtkvolume fixes from trunk
(edit) @5464   9 years ldelgass merge r5463 from trunk
(edit) @5459   9 years ldelgass merge r5458 from trunk
(edit) @5451   9 years ldelgass Merge r5376:5381 from trunk
(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
Note: See TracRevisionLog for help on using the revision log.