#
# ChangeLog for nanovis/branches
#
# Generated by Trac 1.0.13
# Oct 6, 2024, 2:40:04 AM

Wed, 23 Mar 2016 18:12:50 GMT ldelgass [6195]
	* nanovis/branches/1.2/configure.ac (moved)

	rename configure.in to configure.ac


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


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.


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


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: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


Thu, 28 May 2015 01:04:28 GMT ldelgass [5614]
	* nanovis/branches/1.2/nanovisServer.h (modified)

	bump version


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 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: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


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: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


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 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: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 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: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


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


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 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 19:39:51 GMT ldelgass [5424]
	* nanovis/branches/1.2 (modified)

	update mergeinfo


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 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 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


Sat, 02 May 2015 09:31:12 GMT ldelgass [5394]
	* nanovis/branches/1.2 (modified)
	* nanovis/branches/1.2/Makefile.in (modified)
	* nanovis/branches/1.2/Shader.cpp (modified)
	* nanovis/branches/1.2/VelocityArrowsSlice.cpp (modified)
	* nanovis/branches/1.2/config.h (modified)
	* nanovis/branches/1.2/nanovis.cpp (modified)

	Merge r3875:3876 from trunk, update mergeinfo


Sat, 02 May 2015 08:17:11 GMT ldelgass [5393]
	* nanovis/branches/1.2 (modified)

	update mergeinfo


Thu, 30 Apr 2015 15:37:48 GMT ldelgass [5373]
	* nanovis/branches/1.2/ParticleRenderer.cpp (modified)

	minor cleanup


Mon, 27 Apr 2015 23:50:15 GMT ldelgass [5329]
	* nanovis/branches/1.2 (modified)
	* nanovis/branches/1.2/Unirect.cpp (modified)

	merge r5328 from nanovis trunk


Mon, 27 Apr 2015 22:12:40 GMT ldelgass [5327]
	* nanovis/branches/1.2 (modified)
	* nanovis/branches/1.2/dxReader.cpp (modified)

	merge r5326 from nanovis trunk


Sat, 25 Apr 2015 02:28:41 GMT ldelgass [5314]
	* nanovis/branches/1.2/nanovisServer.h (modified)

	bump version


Sat, 25 Apr 2015 02:26:39 GMT ldelgass [5312]
	* nanovis/branches/1.2 (modified)
	* nanovis/branches/1.2/dxReader.cpp (modified)

	merge r5311 from trunk


Fri, 24 Apr 2015 23:34:34 GMT ldelgass [5304]
	* nanovis/branches/1.2 (modified)
	* nanovis/branches/1.2/Command.cpp (modified)

	merge r5302:5303 from trunk


Tue, 24 Feb 2015 22:25:33 GMT ldelgass [5047]
	* nanovis/branches/1.2/Makefile.in (modified)

	particle bitmap only used for pointset renderer


Tue, 24 Feb 2015 21:41:44 GMT ldelgass [5046]
	* nanovis/branches/1.2/nanovisServer.h (modified)

	bump version


Sun, 18 Jan 2015 10:28:38 GMT ldelgass [4937]
	* nanovis/branches/1.2/BMPWriter.cpp (added)
	* nanovis/branches/1.2/BMPWriter.h (added)
	* nanovis/branches/1.2/Command.cpp (modified)
	* nanovis/branches/1.2/Command.h (modified)
	* nanovis/branches/1.2/FlowCmd.cpp (modified)
	* nanovis/branches/1.2/Makefile.in (modified)
	* nanovis/branches/1.2/PPMWriter.cpp (added)
	* nanovis/branches/1.2/PPMWriter.h (added)
	* nanovis/branches/1.2/ResponseQueue.cpp (added)
	* nanovis/branches/1.2/ResponseQueue.h (added)
	* nanovis/branches/1.2/configure (modified)
	* nanovis/branches/1.2/configure.in (modified)
	* nanovis/branches/1.2/nanovis.cpp (modified)
	* nanovis/branches/1.2/nanovis.h (modified)
	* nanovis/branches/1.2/nanovisServer.cpp (modified)
	* nanovis/branches/1.2/nanovisServer.h (modified)

	merge threading


Sun, 18 Jan 2015 02:58:28 GMT ldelgass [4934]
	* nanovis/branches/1.2/nanovisServer.h (modified)

	set version to 1.2.0


Sun, 18 Jan 2015 02:57:19 GMT ldelgass [4933]
	* nanovis/branches/1.2 (copied)

	create nanovis 1.2 branch


Tue, 13 Jan 2015 19:50:08 GMT ldelgass [4923]
	* nanovis/branches/1.1/FlowParticles.cpp (modified)
	* nanovis/branches/1.1/ZincBlendeVolume.h (modified)

	whitespace


Thu, 08 Jan 2015 10:21:02 GMT ldelgass [4920]
	* nanovis/branches/1.1/Makefile.in (modified)

	Don't build newmat11 matrix library unless point set renderer is
	included


Wed, 24 Dec 2014 01:27:03 GMT ldelgass [4908]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/VolumeInterpolator.cpp (modified)

	Merge r4907 from trunk


Mon, 22 Dec 2014 22:24:33 GMT ldelgass [4906]
	* nanovis/branches/1.1/vrmath/Matrix4x4d.cpp (modified)
	* nanovis/branches/1.1/vrmath/Matrix4x4f.cpp (modified)

	merge matrix classes from trunk


Mon, 22 Dec 2014 12:18:59 GMT ldelgass [4904]
	* nanovis/branches/1.1/Axis.h (modified)
	* nanovis/branches/1.1/Camera.cpp (modified)
	* nanovis/branches/1.1/Camera.h (modified)
	* nanovis/branches/1.1/CmdProc.cpp (modified)
	* nanovis/branches/1.1/ColorTableShader.cpp (modified)
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/Flow.cpp (modified)
	* nanovis/branches/1.1/Flow.h (modified)
	* nanovis/branches/1.1/FlowBox.cpp (modified)
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/FlowParticles.cpp (modified)
	* nanovis/branches/1.1/FlowParticles.h (modified)
	* nanovis/branches/1.1/FlowTypes.h (modified)
	* nanovis/branches/1.1/Grid.cpp (modified)
	* nanovis/branches/1.1/Grid.h (modified)
	* nanovis/branches/1.1/HeightMap.cpp (modified)
	* nanovis/branches/1.1/LIC.cpp (modified)
	* nanovis/branches/1.1/LIC.h (modified)
	* nanovis/branches/1.1/Makefile.in (modified)
	* nanovis/branches/1.1/ParticleAdvectionShader.cpp (modified)
	* nanovis/branches/1.1/ParticleAdvectionShader.h (modified)
	* nanovis/branches/1.1/ParticleRenderer.cpp (modified)
	* nanovis/branches/1.1/ParticleRenderer.h (modified)
	* nanovis/branches/1.1/ParticleSystem.cpp (modified)
	* nanovis/branches/1.1/PointSetRenderer.cpp (modified)
	* nanovis/branches/1.1/PointShader.cpp (modified)
	* nanovis/branches/1.1/ReaderCommon.cpp (modified)
	* nanovis/branches/1.1/ReaderCommon.h (modified)
	* nanovis/branches/1.1/RegularVolumeShader.cpp (modified)
	* nanovis/branches/1.1/RenderVertexArray.h (modified)
	* nanovis/branches/1.1/Shader.cpp (modified)
	* nanovis/branches/1.1/Shader.h (modified)
	* nanovis/branches/1.1/StdVertexShader.cpp (modified)
	* nanovis/branches/1.1/Unirect.cpp (modified)
	* nanovis/branches/1.1/Unirect.h (modified)
	* nanovis/branches/1.1/VelocityArrowsSlice.cpp (modified)
	* nanovis/branches/1.1/VelocityArrowsSlice.h (modified)
	* nanovis/branches/1.1/Volume.cpp (modified)
	* nanovis/branches/1.1/Volume.h (modified)
	* nanovis/branches/1.1/VolumeInterpolator.cpp (modified)
	* nanovis/branches/1.1/VolumeInterpolator.h (modified)
	* nanovis/branches/1.1/VolumeRenderer.cpp (modified)
	* nanovis/branches/1.1/VtkReader.cpp (modified)
	* nanovis/branches/1.1/VtkReader.h (modified)
	* nanovis/branches/1.1/ZincBlendeReconstructor.cpp (modified)
	* nanovis/branches/1.1/ZincBlendeReconstructor.h (modified)
	* nanovis/branches/1.1/ZincBlendeVolume.cpp (modified)
	* nanovis/branches/1.1/ZincBlendeVolumeShader.cpp (modified)
	* nanovis/branches/1.1/configure (modified)
	* nanovis/branches/1.1/configure.in (modified)
	* nanovis/branches/1.1/dxReader.cpp (modified)
	* nanovis/branches/1.1/dxReader.h (modified)
	* nanovis/branches/1.1/graphics/Makefile.in (modified)
	* nanovis/branches/1.1/imgLoaders/Makefile.in (modified)
	* nanovis/branches/1.1/nanovis.cpp (modified)
	* nanovis/branches/1.1/nanovis.h (modified)
	* nanovis/branches/1.1/nanovisServer.cpp (modified)
	* nanovis/branches/1.1/newmat11/Makefile.in (modified)
	* nanovis/branches/1.1/nvconf.h.in (modified)
	* nanovis/branches/1.1/shaders/common.cg (modified)
	* nanovis/branches/1.1/shaders/copy_texcoord.cg (modified)
	* nanovis/branches/1.1/shaders/cutplane_fp.cg (modified)
	* nanovis/branches/1.1/shaders/cutplane_vp.cg (modified)
	* nanovis/branches/1.1/shaders/heightcolor.cg (modified)
	* nanovis/branches/1.1/shaders/moveparticles.cg (modified)
	* nanovis/branches/1.1/shaders/one_plane.cg (modified)
	* nanovis/branches/1.1/shaders/one_volume.cg (modified)
	* nanovis/branches/1.1/shaders/particle_common.cg (modified)
	* nanovis/branches/1.1/shaders/particlefp.cg (modified)
	* nanovis/branches/1.1/shaders/particlevp.cg (modified)
	* nanovis/branches/1.1/shaders/passthrough.cg (modified)
	* nanovis/branches/1.1/shaders/passthru.cg (modified)
	* nanovis/branches/1.1/shaders/pointsvp.cg (modified)
	* nanovis/branches/1.1/shaders/queryvelocity.cg (modified)
	* nanovis/branches/1.1/shaders/render_vel.cg (modified)
	* nanovis/branches/1.1/shaders/renderparticle.cg (modified)
	* nanovis/branches/1.1/shaders/update_pos.cg (modified)
	* nanovis/branches/1.1/shaders/update_pos_vel.cg (modified)
	* nanovis/branches/1.1/shaders/update_vel.cg (modified)
	* nanovis/branches/1.1/shaders/velocityslicefp.cg (modified)
	* nanovis/branches/1.1/shaders/velocityslicevp.cg (modified)
	* nanovis/branches/1.1/shaders/vertex_std.cg (modified)
	* nanovis/branches/1.1/shaders/volqd_volume.cg (modified)
	* nanovis/branches/1.1/shaders/zincblende_volume.cg (modified)
	* nanovis/branches/1.1/util/Fonts.cpp (modified)
	* nanovis/branches/1.1/util/Fonts.h (modified)
	* nanovis/branches/1.1/util/Makefile.in (modified)
	* nanovis/branches/1.1/vrmath/Makefile.in (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/BBox.h (modified)

	Merge serveral changes from trunk.  Does not include threading, world ...


Sat, 20 Dec 2014 10:49:45 GMT ldelgass [4893]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/CmdProc.cpp (modified)
	* nanovis/branches/1.1/CmdProc.h (modified)
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/Flow.cpp (modified)
	* nanovis/branches/1.1/Flow.h (modified)
	* nanovis/branches/1.1/FlowBox.cpp (modified)
	* nanovis/branches/1.1/FlowBox.h (modified)
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/FlowParticles.cpp (modified)
	* nanovis/branches/1.1/FlowParticles.h (modified)
	* nanovis/branches/1.1/Switch.cpp (modified)
	* nanovis/branches/1.1/Switch.h (modified)
	* nanovis/branches/1.1/Unirect.cpp (modified)
	* nanovis/branches/1.1/Unirect.h (modified)
	* nanovis/branches/1.1/nanovis.cpp (modified)

	merge r4056 from trunk


Sat, 20 Dec 2014 09:38:33 GMT ldelgass [4892]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/CmdProc.cpp (modified)

	merge r3713 from trunk


Sat, 20 Dec 2014 08:48:23 GMT ldelgass [4891]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector2f.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector3f.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector4f.h (modified)

	merge r3872 from trunk


Sat, 20 Dec 2014 07:37:04 GMT ldelgass [4890]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/FlowParticles.cpp (modified)
	* nanovis/branches/1.1/Grid.cpp (modified)
	* nanovis/branches/1.1/Grid.h (modified)
	* nanovis/branches/1.1/Makefile.in (modified)
	* nanovis/branches/1.1/PCASplit.h (modified)
	* nanovis/branches/1.1/ParticleRenderer.cpp (modified)
	* nanovis/branches/1.1/ParticleRenderer.h (modified)
	* nanovis/branches/1.1/PointSet.cpp (modified)
	* nanovis/branches/1.1/PointSetRenderer.cpp (modified)
	* nanovis/branches/1.1/vrmath/BBox.cpp (modified)
	* nanovis/branches/1.1/vrmath/Makefile.in (modified)
	* nanovis/branches/1.1/vrmath/Matrix4x4d.cpp (modified)
	* nanovis/branches/1.1/vrmath/Matrix4x4f.cpp (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/BBox.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Matrix4x4d.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Matrix4x4f.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Quaternion.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Rotation.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector2f.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector3f.h (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector4f.h (modified)

	merge r3627:3628 from trunk


Sat, 20 Dec 2014 06:00:34 GMT ldelgass [4889]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/Axis.cpp (modified)
	* nanovis/branches/1.1/Axis.h (modified)
	* nanovis/branches/1.1/AxisRange.h (modified)
	* nanovis/branches/1.1/BucketSort.cpp (modified)
	* nanovis/branches/1.1/BucketSort.h (modified)
	* nanovis/branches/1.1/Camera.cpp (copied)
	* nanovis/branches/1.1/Camera.h (copied)
	* nanovis/branches/1.1/Chain.cpp (modified)
	* nanovis/branches/1.1/Chain.h (modified)
	* nanovis/branches/1.1/CircularQueue.h (modified)
	* nanovis/branches/1.1/CmdProc.h (modified)
	* nanovis/branches/1.1/ColorTableShader.cpp (copied)
	* nanovis/branches/1.1/ColorTableShader.h (copied)
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/Command.h (modified)
	* nanovis/branches/1.1/ContourLineFilter.cpp (modified)
	* nanovis/branches/1.1/ContourLineFilter.h (modified)
	* nanovis/branches/1.1/ConvexPolygon.cpp (modified)
	* nanovis/branches/1.1/ConvexPolygon.h (modified)
	* nanovis/branches/1.1/Flow.cpp (modified)
	* nanovis/branches/1.1/Flow.h (modified)
	* nanovis/branches/1.1/FlowBox.cpp (modified)
	* nanovis/branches/1.1/FlowBox.h (modified)
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/FlowCmd.h (modified)
	* nanovis/branches/1.1/FlowParticles.cpp (modified)
	* nanovis/branches/1.1/FlowParticles.h (modified)
	* nanovis/branches/1.1/FlowTypes.h (modified)
	* nanovis/branches/1.1/GradientFilter.cpp (modified)
	* nanovis/branches/1.1/GradientFilter.h (modified)
	* nanovis/branches/1.1/Grid.cpp (modified)
	* nanovis/branches/1.1/Grid.h (modified)
	* nanovis/branches/1.1/HeightMap.cpp (modified)
	* nanovis/branches/1.1/HeightMap.h (modified)
	* nanovis/branches/1.1/LIC.cpp (copied)
	* nanovis/branches/1.1/LIC.h (copied)
	* nanovis/branches/1.1/Makefile.in (modified)
	* nanovis/branches/1.1/NvCamera.cpp (deleted)
	* nanovis/branches/1.1/NvCamera.h (deleted)
	* nanovis/branches/1.1/NvColorTableShader.cpp (deleted)
	* nanovis/branches/1.1/NvColorTableShader.h (deleted)
	* nanovis/branches/1.1/NvLIC.cpp (deleted)
	* nanovis/branches/1.1/NvLIC.h (deleted)
	* nanovis/branches/1.1/NvParticleAdvectionShader.cpp (deleted)
	* nanovis/branches/1.1/NvParticleAdvectionShader.h (deleted)
	* nanovis/branches/1.1/NvParticleRenderer.cpp (deleted)
	* nanovis/branches/1.1/NvParticleRenderer.h (deleted)
	* nanovis/branches/1.1/NvRegularVolumeShader.cpp (deleted)
	* nanovis/branches/1.1/NvRegularVolumeShader.h (deleted)
	* nanovis/branches/1.1/NvShader.cpp (deleted)
	* nanovis/branches/1.1/NvShader.h (deleted)
	* nanovis/branches/1.1/NvStdVertexShader.cpp (deleted)
	* nanovis/branches/1.1/NvStdVertexShader.h (deleted)
	* nanovis/branches/1.1/NvVolumeShader.cpp (deleted)
	* nanovis/branches/1.1/NvVolumeShader.h (deleted)
	* nanovis/branches/1.1/NvZincBlendeReconstructor.cpp (deleted)
	* nanovis/branches/1.1/NvZincBlendeReconstructor.h (deleted)
	* nanovis/branches/1.1/NvZincBlendeVolumeShader.cpp (deleted)
	* nanovis/branches/1.1/NvZincBlendeVolumeShader.h (deleted)
	* nanovis/branches/1.1/PCASplit.cpp (modified)
	* nanovis/branches/1.1/PCASplit.h (modified)
	* nanovis/branches/1.1/ParticleAdvectionShader.cpp (copied)
	* nanovis/branches/1.1/ParticleAdvectionShader.h (copied)
	* nanovis/branches/1.1/ParticleEmitter.cpp (modified)
	* nanovis/branches/1.1/ParticleEmitter.h (modified)
	* nanovis/branches/1.1/ParticleRenderer.cpp (copied)
	* nanovis/branches/1.1/ParticleRenderer.h (copied)
	* nanovis/branches/1.1/ParticleSystem.cpp (modified)
	* nanovis/branches/1.1/ParticleSystem.h (modified)
	* nanovis/branches/1.1/ParticleSystemFactory.cpp (modified)
	* nanovis/branches/1.1/ParticleSystemFactory.h (modified)
	* nanovis/branches/1.1/PerfQuery.cpp (modified)
	* nanovis/branches/1.1/PerfQuery.h (modified)
	* nanovis/branches/1.1/Plane.h (modified)
	* nanovis/branches/1.1/PlaneRenderer.cpp (modified)
	* nanovis/branches/1.1/PlaneRenderer.h (modified)
	* nanovis/branches/1.1/PointSet.cpp (modified)
	* nanovis/branches/1.1/PointSet.h (modified)
	* nanovis/branches/1.1/PointSetRenderer.cpp (modified)
	* nanovis/branches/1.1/PointSetRenderer.h (modified)
	* nanovis/branches/1.1/PointShader.cpp (modified)
	* nanovis/branches/1.1/PointShader.h (modified)
	* nanovis/branches/1.1/ReaderCommon.cpp (modified)
	* nanovis/branches/1.1/ReaderCommon.h (modified)
	* nanovis/branches/1.1/RegularVolumeShader.cpp (copied)
	* nanovis/branches/1.1/RegularVolumeShader.h (copied)
	* nanovis/branches/1.1/RenderVertexArray.cpp (modified)
	* nanovis/branches/1.1/RenderVertexArray.h (modified)
	* nanovis/branches/1.1/Shader.cpp (copied)
	* nanovis/branches/1.1/Shader.h (copied)
	* nanovis/branches/1.1/StdVertexShader.cpp (copied)
	* nanovis/branches/1.1/StdVertexShader.h (copied)
	* nanovis/branches/1.1/Switch.h (modified)
	* nanovis/branches/1.1/Texture1D.cpp (modified)
	* nanovis/branches/1.1/Texture1D.h (modified)
	* nanovis/branches/1.1/Texture2D.cpp (modified)
	* nanovis/branches/1.1/Texture2D.h (modified)
	* nanovis/branches/1.1/Texture3D.cpp (modified)
	* nanovis/branches/1.1/Texture3D.h (modified)
	* nanovis/branches/1.1/TransferFunction.cpp (modified)
	* nanovis/branches/1.1/TransferFunction.h (modified)
	* nanovis/branches/1.1/Unirect.h (modified)
	* nanovis/branches/1.1/VelocityArrowsSlice.cpp (modified)
	* nanovis/branches/1.1/VelocityArrowsSlice.h (modified)
	* nanovis/branches/1.1/Volume.cpp (modified)
	* nanovis/branches/1.1/Volume.h (modified)
	* nanovis/branches/1.1/VolumeInterpolator.cpp (modified)
	* nanovis/branches/1.1/VolumeInterpolator.h (modified)
	* nanovis/branches/1.1/VolumeRenderer.cpp (modified)
	* nanovis/branches/1.1/VolumeRenderer.h (modified)
	* nanovis/branches/1.1/VolumeShader.cpp (copied)
	* nanovis/branches/1.1/VolumeShader.h (copied)
	* nanovis/branches/1.1/VtkReader.cpp (modified)
	* nanovis/branches/1.1/VtkReader.h (modified)
	* nanovis/branches/1.1/ZincBlendeReconstructor.cpp (copied)
	* nanovis/branches/1.1/ZincBlendeReconstructor.h (copied)
	* nanovis/branches/1.1/ZincBlendeVolume.cpp (modified)
	* nanovis/branches/1.1/ZincBlendeVolume.h (modified)
	* nanovis/branches/1.1/ZincBlendeVolumeShader.cpp (copied)
	* nanovis/branches/1.1/ZincBlendeVolumeShader.h (copied)
	* nanovis/branches/1.1/dxReader.cpp (modified)
	* nanovis/branches/1.1/dxReader.h (modified)
	* nanovis/branches/1.1/nanovis.cpp (modified)
	* nanovis/branches/1.1/nanovis.h (modified)
	* nanovis/branches/1.1/nanovisServer.cpp (modified)
	* nanovis/branches/1.1/vrmath/include/vrmath/Vector3f.h (modified)

	Merge r3611:3618 from trunk


Sat, 20 Dec 2014 02:05:08 GMT ldelgass [4888]
	* nanovis/branches/1.1 (modified)

	update mergeinfo


Sat, 20 Dec 2014 01:28:34 GMT ldelgass [4886]
	* nanovis/branches/1.1/nanovis.h (modified)

	cleanup includes


Sat, 20 Dec 2014 01:11:10 GMT ldelgass [4884]
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/protocol-nanovis.txt (modified)

	Remove unused 'flow data file...' command


Sat, 20 Dec 2014 00:40:59 GMT ldelgass [4883]
	* nanovis/branches/1.1/nanovisServer.cpp (modified)
	* nanovis/branches/1.1/nanovisServer.h (modified)

	set eol-style on new files


Sat, 20 Dec 2014 00:40:04 GMT ldelgass [4882]
	* nanovis/branches/1.1/ReadBuffer.cpp (modified)
	* nanovis/branches/1.1/ReadBuffer.h (modified)

	set eol-style on new files


Fri, 19 Dec 2014 23:49:27 GMT ldelgass [4881]
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/nanovis.h (modified)
	* nanovis/branches/1.1/nanovisServer.cpp (modified)

	Fixes for video generation


Fri, 19 Dec 2014 22:12:19 GMT ldelgass [4879]
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/Trace.cpp (modified)
	* nanovis/branches/1.1/Trace.h (modified)
	* nanovis/branches/1.1/nanovis.cpp (modified)

	Fix for ExecuteCommand


Fri, 19 Dec 2014 03:37:09 GMT ldelgass [4877]
	* nanovis/branches/1.1/Unirect.cpp (modified)
	* nanovis/branches/1.1/Unirect.h (modified)
	* nanovis/branches/1.1/nanovis.cpp (modified)
	* nanovis/branches/1.1/protocol-nanovis.txt (modified)

	some cleanups


Fri, 19 Dec 2014 01:53:04 GMT ldelgass [4875]
	* nanovis/branches/1.1/nanovisServer.cpp (modified)

	fix include


Fri, 19 Dec 2014 01:45:38 GMT ldelgass [4874]
	* nanovis/branches/1.1 (modified)
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/Command.h (modified)
	* nanovis/branches/1.1/Flow.cpp (modified)
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/FlowCmd.h (modified)
	* nanovis/branches/1.1/Grid.cpp (modified)
	* nanovis/branches/1.1/HeightMap.cpp (modified)
	* nanovis/branches/1.1/Makefile.in (modified)
	* nanovis/branches/1.1/ReadBuffer.cpp (added)
	* nanovis/branches/1.1/ReadBuffer.h (added)
	* nanovis/branches/1.1/Trace.cpp (modified)
	* nanovis/branches/1.1/Trace.h (modified)
	* nanovis/branches/1.1/Unirect.cpp (modified)
	* nanovis/branches/1.1/VolumeInterpolator.cpp (modified)
	* nanovis/branches/1.1/config.h (modified)
	* nanovis/branches/1.1/nanovis.cpp (modified)
	* nanovis/branches/1.1/nanovis.h (modified)
	* nanovis/branches/1.1/nanovisServer.cpp (added)
	* nanovis/branches/1.1/nanovisServer.h (added)

	Add command line options to set I/O file descriptors, merge some ...


Wed, 10 Dec 2014 07:04:20 GMT ldelgass [4831]
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/Makefile.in (modified)

	update some header deps


Wed, 10 Dec 2014 06:32:28 GMT ldelgass [4830]
	* nanovis/branches/1.1/Command.cpp (modified)
	* nanovis/branches/1.1/FlowCmd.cpp (modified)
	* nanovis/branches/1.1/NvZincBlendeReconstructor.cpp (modified)
	* nanovis/branches/1.1/NvZincBlendeReconstructor.h (modified)

	Preallocate full size Rappture buffer for data payloads


Wed, 10 Dec 2014 05:36:27 GMT ldelgass [4829]
	* nanovis/branches/1.1/Command.cpp (modified)

	Add stub imgflush command


Tue, 09 Dec 2014 22:10:48 GMT ldelgass [4827]
	* nanovis/branches/1.1/Command.cpp (modified)

	fix for snapshot command


Tue, 09 Dec 2014 22:01:44 GMT ldelgass [4826]
	* nanovis/branches/1.1/Command.cpp (modified)

	use a safe interpreter for nanovis