# # ChangeLog for nanovis # # Generated by Trac 1.0.13 # Apr 19, 2024 3:55:06 PM Sat, 22 Aug 2015 22:11:58 GMT ldelgass [5842] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/configure (modified) * nanovis/branches/1.2/configure.in (modified) merge r5841 from nanovis trunk Sat, 22 Aug 2015 22:09:40 GMT ldelgass [5841] * nanovis/trunk/configure (modified) * nanovis/trunk/configure.in (modified) udpate default VTK version to 6.2.0 in nanovis configure Fri, 19 Jun 2015 19:23:58 GMT ldelgass [5724] * nanovis/tags/1.2.4 (copied) tag nanovis 1.2.4 release Thu, 18 Jun 2015 21:32:37 GMT ldelgass [5723] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Sync with nanovis trunk: merge r5722 and remove global bounds vars. Thu, 18 Jun 2015 21:30:27 GMT ldelgass [5722] * nanovis/trunk/Flow.cpp (modified) * nanovis/trunk/nanovis.cpp (modified) Set flags to update ranges when deleting objects Wed, 17 Jun 2015 20:41:03 GMT ldelgass [5719] * nanovis/trunk/OrientationIndicator.cpp (modified) Merge changes to OrientationIndicator from nanovis release branch: ... Wed, 17 Jun 2015 09:23:37 GMT ldelgass [5718] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/ConvexPolygon.cpp (modified) * nanovis/branches/1.2/ConvexPolygon.h (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/ParticleAdvectionShader.h (modified) * nanovis/branches/1.2/ParticleRenderer.h (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Merge from trunk Wed, 17 Jun 2015 09:14:44 GMT ldelgass [5717] * nanovis/trunk/VtkDataSetReader.cpp (modified) * nanovis/trunk/nanovis.cpp (modified) * nanovis/trunk/nanovis.h (modified) Downsample volume if dims exceed hardware limits Wed, 17 Jun 2015 09:02:44 GMT ldelgass [5716] * nanovis/trunk/nanovis.cpp (modified) * nanovis/trunk/nanovis.h (modified) Rename argument: legend tag is specified by client and returned, it ... Wed, 17 Jun 2015 08:53:04 GMT ldelgass [5715] * nanovis/trunk/HeightMap.cpp (modified) minor cleanup Wed, 17 Jun 2015 08:47:45 GMT ldelgass [5714] * nanovis/trunk/ParticleRenderer.h (modified) add comment Wed, 17 Jun 2015 08:44:54 GMT ldelgass [5713] * nanovis/trunk/ConvexPolygon.cpp (modified) * nanovis/trunk/ConvexPolygon.h (modified) remove unused method Wed, 17 Jun 2015 08:23:33 GMT ldelgass [5712] * nanovis/trunk/ParticleAdvectionShader.h (modified) merge comment from nanovis 1.2 branch Tue, 16 Jun 2015 20:53:12 GMT ldelgass [5705] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/FlowParticles.cpp (modified) Merge from nanovis trunk Tue, 16 Jun 2015 20:46:13 GMT ldelgass [5704] * nanovis/trunk/FlowParticles.cpp (modified) Fix return value Tue, 16 Jun 2015 20:45:20 GMT ldelgass [5703] * nanovis/trunk (modified) * nanovis/trunk/Flow.cpp (modified) * nanovis/trunk/Flow.h (modified) * nanovis/trunk/nanovis.cpp (modified) merge r5702 from nanovis 1.2 branch to sync Tue, 16 Jun 2015 20:33:25 GMT ldelgass [5702] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/Flow.h (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/dxReader.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) Merge r5613 from nanovis trunk Tue, 16 Jun 2015 19:37:36 GMT ldelgass [5701] * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/FlowBox.cpp (modified) * nanovis/branches/1.2/FlowBox.h (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/HeightMap.h (modified) * nanovis/branches/1.2/Volume.cpp (modified) * nanovis/branches/1.2/Volume.h (modified) * nanovis/branches/1.2/VolumeRenderer.h (modified) * nanovis/branches/1.2/nanovis.cpp (modified) Merge some refactoring changes from trunk Mon, 15 Jun 2015 22:24:13 GMT ldelgass [5700] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 15 Jun 2015 22:08:46 GMT ldelgass [5699] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) Merge from trunk Mon, 15 Jun 2015 22:04:15 GMT ldelgass [5698] * nanovis/branches/1.2/Camera.cpp (modified) * nanovis/branches/1.2/Camera.h (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Merge camera changes from trunk Mon, 15 Jun 2015 21:59:53 GMT ldelgass [5697] * nanovis/trunk/Camera.cpp (modified) Remove extra semicolon Sun, 14 Jun 2015 21:57:41 GMT ldelgass [5696] * nanovis/trunk/HeightMap.cpp (modified) whitespace Mon, 08 Jun 2015 05:23:21 GMT ldelgass [5672] * nanovis/trunk/VtkDataSetReader.cpp (modified) Add debug output to VTK reader Thu, 28 May 2015 01:04:28 GMT ldelgass [5614] * nanovis/branches/1.2/nanovisServer.h (modified) bump version Thu, 28 May 2015 00:41:31 GMT ldelgass [5613] * nanovis/trunk/Makefile.in (modified) * nanovis/trunk/dxReader.cpp (modified) * nanovis/trunk/nanovis.cpp (modified) Fix header deps Fri, 22 May 2015 21:47:15 GMT ldelgass [5603] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Command.h (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) move old processCommands to Command.cpp Thu, 21 May 2015 20:46:51 GMT ldelgass [5597] * nanovis/tags/1.2.3 (copied) tag nanovis 1.2.3 release Thu, 21 May 2015 10:40:17 GMT ldelgass [5590] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Shader.h (modified) sync merge r5589 from nanovis trunk Thu, 21 May 2015 10:38:59 GMT ldelgass [5589] * nanovis/trunk/Shader.h (modified) sync with release branch Thu, 21 May 2015 10:27:43 GMT ldelgass [5588] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Doxyfile.in (modified) * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/Flow.h (modified) * nanovis/branches/1.2/FlowCmd.cpp (modified) * nanovis/branches/1.2/FlowParticles.cpp (modified) * nanovis/branches/1.2/FlowParticles.h (modified) * nanovis/branches/1.2/FlowTypes.h (modified) * nanovis/branches/1.2/Grid.cpp (modified) * nanovis/branches/1.2/LIC.cpp (modified) * nanovis/branches/1.2/LIC.h (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/ParticleAdvectionShader.h (modified) * nanovis/branches/1.2/ParticleRenderer.cpp (modified) * nanovis/branches/1.2/ParticleRenderer.h (modified) * nanovis/branches/1.2/ParticleSystem.cpp (modified) * nanovis/branches/1.2/Shader.h (modified) * nanovis/branches/1.2/Unirect.cpp (modified) * nanovis/branches/1.2/Unirect.h (modified) * nanovis/branches/1.2/VelocityArrowsSlice.cpp (modified) * nanovis/branches/1.2/VelocityArrowsSlice.h (modified) * nanovis/branches/1.2/Volume.cpp (modified) * nanovis/branches/1.2/Volume.h (modified) * nanovis/branches/1.2/dxReader.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Merge support for VTK vector fields in nanovis to release branch Thu, 21 May 2015 09:30:27 GMT ldelgass [5587] * nanovis/trunk/Flow.h (modified) * nanovis/trunk/Makefile.in (modified) * nanovis/trunk/ParticleRenderer.cpp (modified) * nanovis/trunk/ParticleRenderer.h (modified) * nanovis/trunk/VelocityArrowsSlice.cpp (modified) * nanovis/trunk/dxReader.cpp (modified) * nanovis/trunk/shaders/update_pos.cg (modified) Some fixes from release branch Thu, 21 May 2015 00:49:14 GMT ldelgass [5586] * nanovis/trunk/Flow.cpp (modified) whitespace Wed, 20 May 2015 22:37:59 GMT ldelgass [5585] * nanovis/branches/1.2/nanovis.h (modified) Remove static var missed in r5523 Wed, 20 May 2015 22:22:40 GMT ldelgass [5584] * nanovis/branches/1.2/nanovis.cpp (modified) Syncing with trunk: update clipping range in all camera methods Wed, 20 May 2015 03:28:09 GMT ldelgass [5576] * nanovis/branches/1.2/Flow.cpp (modified) Fix potential crash if volume not created when getting bounds for ... Tue, 19 May 2015 02:50:45 GMT ldelgass [5553] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) * nanovis/branches/1.2/Unirect.h (modified) merge r5552 from nanovis trunk Tue, 19 May 2015 02:49:47 GMT ldelgass [5552] * nanovis/trunk/Unirect.cpp (modified) * nanovis/trunk/Unirect.h (modified) whitespace Tue, 19 May 2015 02:45:26 GMT ldelgass [5551] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/FlowCmd.cpp (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/HeightMap.h (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) * nanovis/branches/1.2/VtkReader.cpp (modified) * nanovis/branches/1.2/dxReader.cpp (modified) merge r5549:5550 from nanovis trunk Tue, 19 May 2015 02:42:02 GMT ldelgass [5550] * nanovis/trunk/HeightMap.cpp (modified) * nanovis/trunk/HeightMap.h (modified) whitespace Tue, 19 May 2015 02:37:15 GMT ldelgass [5549] * nanovis/trunk/FlowCmd.cpp (modified) * nanovis/trunk/VtkDataSetReader.cpp (modified) * nanovis/trunk/VtkReader.cpp (modified) * nanovis/trunk/dxReader.cpp (modified) %lg only valid in scanf, not printf Mon, 18 May 2015 17:54:25 GMT ldelgass [5543] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/protocol-nanovis.txt (modified) mergeinfo sync Mon, 18 May 2015 09:47:29 GMT ldelgass [5542] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Axis.cpp (modified) * nanovis/branches/1.2/Axis.h (modified) * nanovis/branches/1.2/Chain.cpp (deleted) * nanovis/branches/1.2/Chain.h (deleted) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Grid.cpp (modified) * nanovis/branches/1.2/HeightMap.cpp (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/nanovis.cpp (modified) Merge r5478,r5480 from nanovis trunk (grid refactoring) Sun, 17 May 2015 00:09:20 GMT ldelgass [5524] * nanovis/branches/1.2/OrientationIndicator.cpp (modified) Fix x axis label orientation Sat, 16 May 2015 01:52:06 GMT ldelgass [5523] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/OrientationIndicator.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Remove old axis from nanovis Fri, 15 May 2015 11:14:04 GMT ldelgass [5519] * nanovis/branches/1.2/nanovisServer.h (modified) bump version Fri, 15 May 2015 11:09:19 GMT ldelgass [5518] * nanovis/tags/1.2.2 (copied) tag 1.2.2 release of nanovis Fri, 15 May 2015 07:31:44 GMT ldelgass [5516] * nanovis/branches/1.2/OrientationIndicator.cpp (modified) * nanovis/branches/1.2/OrientationIndicator.h (modified) Merge trunk version of OrientationIndicator (scaling/translation) Mon, 11 May 2015 21:46:22 GMT ldelgass [5500] * nanovis/branches/1.2/nanovis.cpp (modified) fix merge problem from r5489 Mon, 11 May 2015 20:50:01 GMT ldelgass [5499] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Makefile.in (modified) merge r4060 Mon, 11 May 2015 20:44:39 GMT ldelgass [5498] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/OrientationIndicator.cpp (copied) * nanovis/branches/1.2/OrientationIndicator.h (copied) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Officially merge r3605 -- picks up OrientationIndicator, but is ... Mon, 11 May 2015 20:18:55 GMT ldelgass [5497] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 20:11:44 GMT ldelgass [5496] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 19:40:35 GMT ldelgass [5495] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) more merge updates Mon, 11 May 2015 19:26:36 GMT ldelgass [5494] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) merge r5492 from nanovis trunk Mon, 11 May 2015 19:21:11 GMT ldelgass [5493] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 19:12:52 GMT ldelgass [5492] * nanovis/trunk/nanovisServer.cpp (modified) Go back to writing version with buffered output: the threaded server ... Mon, 11 May 2015 19:11:50 GMT ldelgass [5491] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/nanovisServer.cpp (modified) More merge updates Mon, 11 May 2015 18:01:08 GMT ldelgass [5490] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 11 May 2015 16:57:59 GMT ldelgass [5489] * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/Flow.h (modified) * nanovis/branches/1.2/FlowCmd.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Move cumulative flow min/max magnitude to Flow. Mon, 11 May 2015 09:50:11 GMT ldelgass [5488] * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) Partial (manual) merge of r3935 - vector fields in VTK reader Mon, 11 May 2015 09:14:17 GMT ldelgass [5487] * nanovis/trunk/FlowParticles.cpp (modified) init _volume ivar Mon, 11 May 2015 02:34:24 GMT ldelgass [5486] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) merge r5479 from nanovis trunk Sat, 09 May 2015 21:03:06 GMT ldelgass [5485] * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) backport: remove getFlowBounds Sat, 09 May 2015 20:57:38 GMT ldelgass [5484] * nanovis/trunk/Makefile.in (modified) whitespace Sat, 09 May 2015 20:52:14 GMT ldelgass [5483] * nanovis/trunk/ParticleRenderer.cpp (modified) * nanovis/trunk/configure.in (modified) whitespace/comment Sat, 09 May 2015 20:39:49 GMT ldelgass [5482] * nanovis/branches/1.2/ParticleRenderer.cpp (modified) whitespace Sat, 09 May 2015 20:37:21 GMT ldelgass [5481] * nanovis/branches/1.2/ParticleRenderer.cpp (modified) * nanovis/branches/1.2/ParticleRenderer.h (modified) Merge (manual) ParticleRenderer changes from trunk Sat, 09 May 2015 20:20:00 GMT ldelgass [5480] * nanovis/trunk/Axis.h (modified) remove unused member var Sat, 09 May 2015 10:18:33 GMT ldelgass [5479] * nanovis/trunk/Command.cpp (modified) whitespace Sat, 09 May 2015 09:56:07 GMT ldelgass [5478] * nanovis/trunk/Axis.cpp (modified) * nanovis/trunk/Axis.h (modified) * nanovis/trunk/Chain.cpp (deleted) * nanovis/trunk/Chain.h (deleted) * nanovis/trunk/Command.cpp (modified) * nanovis/trunk/Grid.cpp (modified) * nanovis/trunk/HeightMap.cpp (modified) * nanovis/trunk/Makefile.in (modified) * nanovis/trunk/nanovis.cpp (modified) Begin refactoring axis/grid in nanovis: remove unused features, make ... Fri, 08 May 2015 03:37:37 GMT ldelgass [5477] * nanovis/branches/1.2/nvconf.h.in (modified) autoheader update Fri, 08 May 2015 03:26:03 GMT ldelgass [5476] * nanovis/branches/1.2/Makefile.in (modified) Don't build old VTK reader if using new one Fri, 08 May 2015 02:53:54 GMT ldelgass [5475] * nanovis/branches/1.2/Command.cpp (modified) fix include Fri, 08 May 2015 02:43:36 GMT ldelgass [5474] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (modified) minor merge in nanovis 1.2 branch Fri, 08 May 2015 02:34:44 GMT ldelgass [5473] * nanovis/branches/1.2 (modified) update mergeinfo Fri, 08 May 2015 02:11:27 GMT ldelgass [5472] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Command.cpp (modified) * nanovis/branches/1.2/DataSetResample.cpp (copied) * nanovis/branches/1.2/DataSetResample.h (copied) * nanovis/branches/1.2/Makefile.in (modified) * nanovis/branches/1.2/VtkDataSetReader.cpp (copied) * nanovis/branches/1.2/VtkDataSetReader.h (copied) * nanovis/branches/1.2/configure (modified) * nanovis/branches/1.2/configure.in (modified) Merge r3870,r4061 from nanovis trunk (new VTK reader/resampler - ... Thu, 07 May 2015 11:38:35 GMT ldelgass [5461] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) merge r5460 from nanovis trunk Thu, 07 May 2015 11:37:39 GMT ldelgass [5460] * nanovis/trunk/Unirect.cpp (modified) Fix DX keyword order in unirect DX import Wed, 06 May 2015 20:01:23 GMT ldelgass [5431] * nanovis/branches/1.2 (modified) * nanovis/branches/1.2/Unirect.cpp (modified) merge r5430 from trunk Wed, 06 May 2015 20:00:45 GMT ldelgass [5430] * nanovis/trunk/Unirect.cpp (modified) Fix detection of skewed grids in unirect DX parser Wed, 06 May 2015 19:06:24 GMT ldelgass [5429] * nanovis/branches/1.2 (modified) update mergeinfo Wed, 06 May 2015 00:32:41 GMT ldelgass [5428] * nanovis/branches/1.2 (modified) update mergeinfo Tue, 05 May 2015 20:54:23 GMT ldelgass [5427] * nanovis/branches/1.2 (modified) update mergeinfo Tue, 05 May 2015 20:44:00 GMT ldelgass [5426] * nanovis/trunk/ZincBlendeReconstructor.cpp (modified) Drop check for misspelled keyword in (unused) ZincBlende data parser Tue, 05 May 2015 20:40:09 GMT ldelgass [5425] * nanovis/trunk/FlowCmd.cpp (modified) * nanovis/trunk/nanovisServer.cpp (modified) drop namespace qualifier on globals where we have a using directive. Tue, 05 May 2015 19:39:51 GMT ldelgass [5424] * nanovis/branches/1.2 (modified) update mergeinfo Mon, 04 May 2015 11:35:49 GMT ldelgass [5407] * nanovis/trunk/ZincBlendeVolume.h (modified) whitespace Mon, 04 May 2015 11:31:25 GMT ldelgass [5406] * nanovis/branches/1.2/Volume.cpp (modified) * nanovis/branches/1.2/Volume.h (modified) * nanovis/branches/1.2/VolumeInterpolator.cpp (modified) * nanovis/branches/1.2/ZincBlendeReconstructor.cpp (modified) * nanovis/branches/1.2/ZincBlendeVolume.cpp (modified) * nanovis/branches/1.2/ZincBlendeVolume.h (modified) * nanovis/branches/1.2/nanovis.cpp (modified) backport from trunk: remove unused ctor params Mon, 04 May 2015 11:19:26 GMT ldelgass [5405] * nanovis/branches/1.2/nanovis.cpp (modified) fix typo Mon, 04 May 2015 10:52:34 GMT ldelgass [5404] * nanovis/trunk/ParticleRenderer.cpp (modified) whitespace Mon, 04 May 2015 07:59:57 GMT ldelgass [5403] * nanovis/trunk/FlowParticles.cpp (modified) Fix FlowParticles for change in flow position type Mon, 04 May 2015 07:37:51 GMT ldelgass [5402] * nanovis/branches/1.2/Flow.cpp (modified) * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) Backport from trunk: make use of BBox Mon, 04 May 2015 06:37:33 GMT ldelgass [5401] * nanovis/branches/1.2/nanovis.cpp (modified) * nanovis/branches/1.2/nanovis.h (modified) remove unused var Mon, 04 May 2015 00:34:14 GMT ldelgass [5400] * nanovis/branches/1.2/nanovis.cpp (modified) minor change to sync with nanovis trunk Sat, 02 May 2015 22:23:07 GMT ldelgass [5399] * nanovis/trunk/Flow.cpp (modified) * nanovis/trunk/FlowCmd.cpp (modified) * nanovis/trunk/FlowTypes.h (modified) Use double for Flow position since it can be an absolute value. Sat, 02 May 2015 19:38:21 GMT ldelgass [5398] * nanovis/branches/1.2 (modified) update mergeinfo Sat, 02 May 2015 10:19:17 GMT ldelgass [5397] * nanovis/branches/1.2/ParticleAdvectionShader.cpp (modified) * nanovis/branches/1.2/ParticleAdvectionShader.h (modified) * nanovis/branches/1.2/ParticleRenderer.cpp (modified) * nanovis/branches/1.2/shaders/update_pos.cg (modified) Hand merge fix for flow reset Sat, 02 May 2015 09:57:34 GMT ldelgass [5396] * nanovis/branches/1.2 (modified) update mergeinfo Sat, 02 May 2015 09:38:26 GMT ldelgass [5395] * nanovis/branches/1.2 (modified) update mergeinfo