#
# ChangeLog for nanovis
#
# Generated by Trac 1.0.13
# Apr 18, 2024 6:39:27 AM

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


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:30:28 GMT ldelgass [5328]
	* nanovis/trunk/Unirect.cpp (modified)

	add delta checks to nanovis unirect DX parser


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


Mon, 27 Apr 2015 22:08:24 GMT ldelgass [5326]
	* nanovis/trunk/dxReader.cpp (modified)

	nanovis can't handle negative deltas in DX files, so return an error ...


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

	bump version


Sat, 25 Apr 2015 02:27:27 GMT ldelgass [5313]
	* nanovis/tags/1.2.1 (copied)

	tag 1.2.1 release


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


Sat, 25 Apr 2015 02:25:12 GMT ldelgass [5311]
	* nanovis/trunk/dxReader.cpp (modified)

	Check for valid deltas in DX


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


Fri, 24 Apr 2015 23:33:32 GMT ldelgass [5303]
	* nanovis/trunk/Command.cpp (modified)

	fix copy/paste error


Fri, 24 Apr 2015 23:28:43 GMT ldelgass [5302]
	* nanovis/trunk/Command.cpp (modified)
	* nanovis/trunk/FlowCmd.cpp (modified)

	Don't abort on bad number of bytes, just return an error


Tue, 24 Feb 2015 22:45:39 GMT ldelgass [5048]
	* nanovis/trunk (modified)
	* nanovis/trunk/Makefile.in (modified)

	merge r5047 from release branch


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, 22 Feb 2015 23:31:34 GMT ldelgass [5040]
	* nanovis/tags/1.2.0 (copied)

	Tag nanovis 1.2.0 release


Tue, 20 Jan 2015 06:38:09 GMT ldelgass [4949]
	* nanovis/trunk/Makefile.in (modified)
	* nanovis/trunk/configure (modified)
	* nanovis/trunk/configure.in (modified)
	* nanovis/trunk/nanovis.cpp (modified)
	* nanovis/trunk/nanovis.h (modified)

	Bump version in configure, minor cleanups


Tue, 20 Jan 2015 01:43:30 GMT ldelgass [4948]
	* nanovis/trunk (modified)
	* nanovis/trunk/Command.h (modified)
	* nanovis/trunk/Makefile.in (modified)
	* nanovis/trunk/nanovisServer.cpp (modified)

	Merge r4920 from release branch


Tue, 20 Jan 2015 01:20:21 GMT ldelgass [4947]
	* nanovis/trunk/nanovis.cpp (modified)

	use proper texparam call for type


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 08:51:06 GMT ldelgass [4936]
	* nanovis/trunk/Camera.h (modified)
	* nanovis/trunk/Command.cpp (modified)
	* nanovis/trunk/nanovisServer.cpp (modified)

	whitespace


Sun, 18 Jan 2015 03:00:10 GMT ldelgass [4935]
	* nanovis/trunk/nanovisServer.h (modified)

	bump version


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


Fri, 16 Jan 2015 23:26:49 GMT ldelgass [4930]
	* nanovis/tags/1.1.4 (copied)

	tag nanovis 1.1.4 release


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


Wed, 24 Dec 2014 01:24:52 GMT ldelgass [4907]
	* nanovis/trunk/VolumeInterpolator.cpp (modified)

	volume interpolator fix


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 22:22:29 GMT ldelgass [4905]
	* nanovis/trunk/vrmath/Matrix4x4f.cpp (modified)

	Apply matrix changes from double to float version


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


Mon, 22 Dec 2014 10:21:32 GMT ldelgass [4903]
	* nanovis/trunk/VelocityArrowsSlice.cpp (modified)

	sync with release branch


Mon, 22 Dec 2014 09:54:15 GMT ldelgass [4902]
	* nanovis/trunk/Grid.cpp (modified)

	sync with release branch


Mon, 22 Dec 2014 09:27:27 GMT ldelgass [4901]
	* nanovis/trunk/Command.h (modified)
	* nanovis/trunk/Grid.cpp (modified)
	* nanovis/trunk/LIC.cpp (modified)
	* nanovis/trunk/nanovis.cpp (modified)

	sync with release branch


Mon, 22 Dec 2014 07:58:47 GMT ldelgass [4900]
	* nanovis/trunk/LIC.h (modified)

	sync with release branch


Mon, 22 Dec 2014 07:55:58 GMT ldelgass [4899]
	* nanovis/trunk/Camera.h (modified)
	* nanovis/trunk/Command.cpp (modified)
	* nanovis/trunk/Flow.h (modified)
	* nanovis/trunk/Makefile.in (modified)
	* nanovis/trunk/Volume.cpp (modified)

	Sync with release branch


Mon, 22 Dec 2014 01:16:53 GMT ldelgass [4898]
	* nanovis/trunk/Makefile.in (modified)

	add header deps


Mon, 22 Dec 2014 01:12:14 GMT ldelgass [4897]
	* nanovis/trunk/Makefile.in (modified)
	* nanovis/trunk/ReaderCommon.cpp (modified)
	* nanovis/trunk/Volume.h (modified)
	* nanovis/trunk/dxReader.cpp (modified)
	* nanovis/trunk/nanovis.h (modified)

	add header deps


Mon, 22 Dec 2014 00:52:39 GMT ldelgass [4896]
	* nanovis/trunk/Makefile.in (modified)

	add header deps


Sun, 21 Dec 2014 23:40:03 GMT ldelgass [4895]
	* nanovis/trunk/Command.cpp (modified)
	* nanovis/trunk/FlowCmd.cpp (modified)
	* nanovis/trunk/ParticleAdvectionShader.h (modified)
	* nanovis/trunk/Shader.h (modified)
	* nanovis/trunk/Unirect.cpp (modified)
	* nanovis/trunk/Unirect.h (modified)
	* nanovis/trunk/ZincBlendeVolume.cpp (modified)

	Merge some fixes from release branch


Sat, 20 Dec 2014 21:00:49 GMT ldelgass [4894]
	* nanovis/trunk/Command.cpp (modified)
	* nanovis/trunk/LIC.cpp (modified)
	* nanovis/trunk/ZincBlendeReconstructor.cpp (modified)
	* nanovis/trunk/ZincBlendeReconstructor.h (modified)

	sync with release branch


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:30:01 GMT ldelgass [4887]
	* nanovis/trunk/nanovis.h (modified)

	cleanup includes


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

	cleanup includes


Sat, 20 Dec 2014 01:13:34 GMT ldelgass [4885]
	* nanovis/trunk/FlowCmd.cpp (modified)
	* nanovis/trunk/protocol-nanovis.txt (modified)

	Merge fixes from release branch


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 23:43:54 GMT ldelgass [4880]
	* nanovis/trunk/Command.cpp (modified)
	* nanovis/trunk/FlowCmd.cpp (modified)
	* nanovis/trunk/nanovisServer.cpp (modified)

	Fix leak in sendDataToClient method (when USE_THREADS is enabled)


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:38 GMT ldelgass [4878]
	* nanovis/trunk/Unirect.cpp (modified)

	sync


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 03:04:14 GMT ldelgass [4876]
	* nanovis/trunk/Makefile.in (modified)

	add header dep