# # ChangeLog for / # # Generated by Trac 1.0.13 # Apr 23, 2024 10:47:24 PM Thu, 04 Sep 2014 18:18:26 GMT ldelgass [4629] * geovis/trunk/Makefile.in (modified) * geovis/trunk/RenderServer.h (modified) * geovis/trunk/Renderer.cpp (modified) * geovis/trunk/Renderer.h (modified) * geovis/trunk/RendererCmd.cpp (modified) * geovis/trunk/ResponseQueue.cpp (modified) * geovis/trunk/geovis_protocol.txt (modified) add token to map/screen coord commands Wed, 27 Aug 2014 20:08:53 GMT ldelgass [4628] * geovis/trunk/Makefile.in (modified) * geovis/trunk/RenderServer.cpp (modified) * geovis/trunk/Renderer.cpp (modified) * geovis/trunk/Renderer.h (modified) * geovis/trunk/RendererCmd.cpp (modified) Add some Makefile flags for sleep throttling settings Wed, 20 Aug 2014 22:44:13 GMT ldelgass [4627] * pymolproxy/trunk/pymolproxy.c (modified) fix comment Wed, 20 Aug 2014 14:24:31 GMT ldelgass [4626] * nanovis/tags/1.1.1 (copied) Tag nanovis 1.1.1 release Wed, 20 Aug 2014 14:14:10 GMT ldelgass [4625] * vtkvis/tags/1.7.1 (copied) Tag vtkvis 1.7.1 release Wed, 20 Aug 2014 01:05:00 GMT ldelgass [4624] * nanoscale/trunk/renderservers.tcl.in (modified) * nanoscale/trunk/start_nanoscale.sh.in (modified) Add line (commented out) to run twm in start_nanoscale.sh Wed, 20 Aug 2014 01:02:17 GMT ldelgass [4623] * pymolproxy/branches/1.0/pymolproxy.c (modified) * pymolproxy/trunk/pymolproxy.c (modified) bump versions Wed, 20 Aug 2014 00:38:17 GMT ldelgass [4622] * pymolproxy/tags/1.0.0 (copied) Tag pymolproxy 1.0.0 release Wed, 20 Aug 2014 00:10:12 GMT ldelgass [4621] * nanoscale/tags/1.0.0 (copied) tag nanoscale 1.0.0 Tue, 19 Aug 2014 23:40:52 GMT ldelgass [4620] * nanoscale/branches/1.0 (copied) Create 1.0 release branch for nanoscale Tue, 19 Aug 2014 23:39:46 GMT ldelgass [4619] * vmdshow/branches/0.1 (copied) Create 0.1 release branch for vmdshow Tue, 19 Aug 2014 23:35:21 GMT ldelgass [4618] * pymolproxy/branches/1.0 (copied) Create 1.0 release branch for pymolproxy Fri, 15 Aug 2014 07:04:34 GMT ldelgass [4617] * nanovis/branches/1.1/nanovis.h (modified) add patch version Thu, 14 Aug 2014 20:16:03 GMT ldelgass [4616] * trunk/packages/vizservers (deleted) Remove vizservers from trunk Sat, 02 Aug 2014 19:03:12 GMT ldelgass [4615] * vtkvis/trunk/RenderServer.cpp (modified) string fix Sat, 02 Aug 2014 18:10:02 GMT ldelgass [4614] * nanovis/branches/1.1 (modified) * nanovis/branches/1.1/config.h (modified) merge r3599 from trunk Sat, 02 Aug 2014 18:08:58 GMT ldelgass [4613] * nanovis/branches/1.1 (modified) * nanovis/branches/1.1/FlowCmd.cpp (modified) * nanovis/branches/1.1/Makefile.in (modified) merge r3598 from trunk Sat, 02 Aug 2014 18:06:20 GMT ldelgass [4612] * nanovis/branches/1.1 (modified) * nanovis/branches/1.1/Command.cpp (modified) * nanovis/branches/1.1/Command.h (copied) * nanovis/branches/1.1/Doxyfile.in (modified) * nanovis/branches/1.1/Flow.cpp (copied) * nanovis/branches/1.1/Flow.h (copied) * 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/HeightMap.cpp (modified) * nanovis/branches/1.1/HeightMap.h (modified) * nanovis/branches/1.1/Makefile.in (modified) * nanovis/branches/1.1/NvFlowVisRenderer.cpp (deleted) * nanovis/branches/1.1/NvFlowVisRenderer.h (deleted) * nanovis/branches/1.1/NvVectorField.cpp (deleted) * nanovis/branches/1.1/NvVectorField.h (deleted) * nanovis/branches/1.1/PlaneRenderer.cpp (modified) * 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/Volume.cpp (modified) * nanovis/branches/1.1/Volume.h (modified) * nanovis/branches/1.1/VolumeInterpolator.cpp (modified) * nanovis/branches/1.1/VolumeRenderer.cpp (modified) * nanovis/branches/1.1/VtkReader.cpp (modified) * nanovis/branches/1.1/dxReader.cpp (modified) * nanovis/branches/1.1/nanovis.cpp (modified) * nanovis/branches/1.1/nanovis.h (modified) merge r3597 from trunk Sat, 02 Aug 2014 08:45:12 GMT ldelgass [4611] * nanovis/branches/1.1 (modified) * nanovis/branches/1.1/Makefile.in (modified) * nanovis/branches/1.1/NvColorTableRenderer.cpp (deleted) * nanovis/branches/1.1/NvColorTableRenderer.h (deleted) * nanovis/branches/1.1/nanovis.cpp (modified) * nanovis/branches/1.1/nanovis.h (modified) merge r3596 from trunk Sat, 02 Aug 2014 08:12:12 GMT ldelgass [4610] * vtkvis/branches/1.7/RenderServer.h (modified) add patch version: 1.7.1 Sat, 02 Aug 2014 08:01:34 GMT ldelgass [4609] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/RendererCmd.cpp (modified) * vtkvis/branches/1.7/Volume.cpp (modified) more fix merges Sat, 02 Aug 2014 07:55:11 GMT ldelgass [4608] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/Volume.cpp (modified) * vtkvis/branches/1.7/Volume.h (modified) Merge r4243 from trunk: resampling non-uniform grids for volumes Sat, 02 Aug 2014 07:50:48 GMT ldelgass [4607] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/RendererGraphicsObjs.h (modified) Merge trivial fix from r4174 Sat, 02 Aug 2014 07:47:55 GMT ldelgass [4606] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/PolyData.cpp (modified) * vtkvis/branches/1.7/RenderServer.cpp (modified) * vtkvis/branches/1.7/Renderer.cpp (modified) * vtkvis/branches/1.7/RendererCmd.cpp (modified) More merges from trunk, including command-line arg. for file descriptors Sat, 02 Aug 2014 07:33:06 GMT ldelgass [4605] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/RendererCmd.cpp (modified) * vtkvis/branches/1.7/Trace.cpp (modified) * vtkvis/branches/1.7/Trace.h (modified) Merge crash fix from r4422 in trunk Sat, 02 Aug 2014 07:29:05 GMT ldelgass [4604] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/ColorMap.cpp (modified) * vtkvis/branches/1.7/ColorMap.h (modified) * vtkvis/branches/1.7/Image.cpp (modified) * vtkvis/branches/1.7/Image.h (modified) * vtkvis/branches/1.7/Makefile.in (modified) * vtkvis/branches/1.7/Renderer.cpp (modified) * vtkvis/branches/1.7/RendererCmd.cpp (modified) * vtkvis/branches/1.7/RendererGraphicsObjs.cpp (modified) Merge r4073-4074,4077-4081 from trunk Sat, 02 Aug 2014 07:20:58 GMT ldelgass [4603] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/LIC.cpp (modified) * vtkvis/branches/1.7/LIC.h (modified) * vtkvis/branches/1.7/cf/install-sh (modified) * vtkvis/branches/1.7/cf/mkinstalldirs (modified) merge r4060 from trunk Sat, 02 Aug 2014 07:15:08 GMT ldelgass [4602] * vtkvis/branches/1.7 (modified) * vtkvis/branches/1.7/CmdProc.cpp (modified) * vtkvis/branches/1.7/CmdProc.h (modified) * vtkvis/branches/1.7/RendererCmd.cpp (modified) merge r4059 from trunk Sat, 02 Aug 2014 07:08:27 GMT ldelgass [4601] * vtkvis/branches/1.7/Makefile.in (modified) Need NEW_SCALAR_BAR on for building with final VTK 6.0.0 release Sat, 02 Aug 2014 06:48:02 GMT ldelgass [4600] * nanovis/branches/1.1/configure (modified) * nanovis/branches/1.1/configure.in (modified) Nanovis 1.1 doesn't depend on VTK, so remove VTK search from configure Sat, 02 Aug 2014 05:39:27 GMT ldelgass [4599] * nanovis/branches/1.1 (copied) add nanovis 1.1 branch Sat, 02 Aug 2014 05:33:19 GMT ldelgass [4598] * vtkvis/branches/1.7/Makefile.in (modified) Makefile fixes Sat, 02 Aug 2014 05:21:12 GMT ldelgass [4597] * vtkvis/branches/1.7/cf (added) * vtkvis/branches/1.7/cf/install-sh (added) * vtkvis/branches/1.7/cf/mkinstalldirs (added) * vtkvis/branches/1.7/configure (added) * vtkvis/branches/1.7/configure.in (added) add configure to vtkvis 1.7 branch Sat, 02 Aug 2014 05:18:26 GMT ldelgass [4596] * vtkvis/branches/1.7 (copied) create vtkvis 1.7 branch from trunk r4054 Sat, 02 Aug 2014 03:16:34 GMT ldelgass [4595] * geovis/trunk/configure (modified) * geovis/trunk/configure.in (modified) * pymolproxy/trunk/configure (modified) * pymolproxy/trunk/configure.in (modified) * vtkvis/trunk/configure (modified) * vtkvis/trunk/configure.in (modified) Update version numbers in configure Sat, 02 Aug 2014 02:47:35 GMT ldelgass [4594] * vmdshow (moved) rename vmd directory to vmdshow Sat, 02 Aug 2014 02:31:30 GMT ldelgass [4593] * nanoscale/trunk/renderservers.tcl.in (modified) change pymolproxy binary name Sat, 02 Aug 2014 02:30:44 GMT ldelgass [4592] * pymolproxy/trunk/Makefile.in (modified) * pymolproxy/trunk/pymolproxy.c (moved) Remove old (non-threaded) pymolproxy implementation from trunk. Can ... Sat, 02 Aug 2014 02:18:42 GMT ldelgass [4591] * vtkvis/trunk (copied) copy vtkvis from trunk Sat, 02 Aug 2014 02:17:57 GMT ldelgass [4590] * vmd/trunk (copied) copy vmd server from trunk Sat, 02 Aug 2014 02:12:10 GMT ldelgass [4589] * pymolproxy/trunk/Makefile.in (modified) * pymolproxy/trunk/aclocal.m4 (copied) * pymolproxy/trunk/cf (copied) * pymolproxy/trunk/configure (added) * pymolproxy/trunk/configure.in (copied) add configure for pymolproxy Sat, 02 Aug 2014 02:07:36 GMT ldelgass [4588] * pymolproxy/trunk (copied) copy pymolproxy from trunk Sat, 02 Aug 2014 02:05:00 GMT ldelgass [4587] * nanovis/trunk (copied) copy nanovis from trunk Sat, 02 Aug 2014 02:03:36 GMT ldelgass [4586] * geovis/trunk (copied) copy geovis from trunk Sat, 02 Aug 2014 01:43:20 GMT ldelgass [4585] * nanoscale/trunk/Makefile.in (modified) fix tab Sat, 02 Aug 2014 01:32:33 GMT ldelgass [4584] * nanoscale/trunk/Makefile.in (modified) * nanoscale/trunk/aclocal.m4 (copied) * nanoscale/trunk/cf (copied) * trunk/packages/vizservers/cf/rpLangPython.m4 (deleted) * nanoscale/trunk/configure (added) * nanoscale/trunk/configure.in (copied) * nanoscale/trunk/start_nanoscale.sh.in (copied) add configure for nanoscale Sat, 02 Aug 2014 01:16:55 GMT ldelgass [4583] * nanoscale/trunk (copied) copy nanoscale trunk Sat, 02 Aug 2014 00:58:36 GMT ldelgass [4582] * geovis (added) * geovis/branches (added) * geovis/tags (added) * geovis/trunk (added) * nanoscale (added) * nanoscale/branches (added) * nanoscale/tags (added) * nanoscale/trunk (added) * nanovis (added) * nanovis/branches (added) * nanovis/tags (added) * nanovis/trunk (added) * pymolproxy (added) * pymolproxy/branches (added) * pymolproxy/tags (added) * pymolproxy/trunk (added) * vmd (added) * vmd/branches (added) * vmd/tags (added) * vmd/trunk (added) * vtkvis (added) * vtkvis/branches (added) * vtkvis/tags (added) * vtkvis/trunk (added) add separated render server directories Fri, 01 Aug 2014 21:42:55 GMT ldelgass [4581] * branches/1.3/packages/vizservers (deleted) remove vizservers from 1.3 branch Fri, 01 Aug 2014 05:30:31 GMT ldelgass [4580] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) Fix for nanohub ticket #267244, hubzero ticket: #5806 Thu, 31 Jul 2014 19:36:41 GMT gah [4579] * branches/1.3/gui/scripts/images/layers.png (added) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/resultselector.tcl (modified) don't treat value from resultset as a list, add new layers image. Sun, 27 Jul 2014 21:00:08 GMT ldelgass [4578] * trunk/packages/vizservers/geovis/geovis_protocol.txt (modified) protocol doc update Sun, 27 Jul 2014 20:43:37 GMT ldelgass [4577] * trunk/gui/scripts/mapviewer.tcl (modified) Fix test for out of range map coords response Sun, 27 Jul 2014 20:34:15 GMT ldelgass [4576] * trunk/gui/scripts/map.tcl (modified) * trunk/gui/scripts/mapviewer.tcl (modified) Update client to handle new server protocol (map coords returns srs ... Sun, 27 Jul 2014 20:28:15 GMT ldelgass [4575] * trunk/packages/vizservers/geovis/Renderer.cpp (modified) * trunk/packages/vizservers/geovis/Renderer.h (modified) * trunk/packages/vizservers/geovis/RendererCmd.cpp (modified) Add optional coordinate conversion for 'map coords' command, add ... Wed, 23 Jul 2014 22:27:12 GMT ldelgass [4574] * trunk/packages/vizservers/geovis/Renderer.cpp (modified) Add include for GeoMath Wed, 23 Jul 2014 22:20:15 GMT ldelgass [4573] * trunk/packages/vizservers/geovis/Renderer.cpp (modified) Fix for skynode Tue, 22 Jul 2014 18:49:01 GMT gah [4572] * branches/1.3/gui/scripts/balloon.tcl (modified) remove bogus -local switch Tue, 22 Jul 2014 18:48:29 GMT gah [4571] * branches/1.3/gui/scripts/bugreport.tcl (modified) fix placement of bugreport window Tue, 22 Jul 2014 18:48:15 GMT gah [4570] * branches/1.3/gui/scripts/grab.tcl (modified) fix sticky global grab Fri, 18 Jul 2014 16:58:02 GMT gah [4569] * branches/1.3/gui/scripts/images/layers.png (deleted) Fri, 18 Jul 2014 14:56:54 GMT ldelgass [4568] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) minor fixes to sync with trunk Fri, 18 Jul 2014 14:56:06 GMT ldelgass [4567] * trunk/gui/scripts/vtkvolumeviewer.tcl (modified) whitespace Fri, 18 Jul 2014 14:35:31 GMT ldelgass [4566] * trunk/gui/scripts/vtkvolumeviewer.tcl (modified) Turn off all objects when Rebuilding scene Fri, 18 Jul 2014 06:03:46 GMT ldelgass [4565] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) typo Fri, 18 Jul 2014 06:02:50 GMT ldelgass [4564] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) Restore conversion of opacity value Fri, 18 Jul 2014 05:59:23 GMT ldelgass [4563] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) Fix component-specific opacity setting. _widget was preventing the ... Fri, 18 Jul 2014 05:43:24 GMT ldelgass [4562] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) lighting fixes Fri, 18 Jul 2014 05:36:29 GMT ldelgass [4561] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) lighting fixes Fri, 18 Jul 2014 05:33:47 GMT ldelgass [4560] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) lighting fixes Fri, 18 Jul 2014 05:25:28 GMT ldelgass [4559] * trunk/gui/scripts/nanovisviewer.tcl (modified) * trunk/gui/scripts/vtkvolumeviewer.tcl (modified) Sync fixes Fri, 18 Jul 2014 05:22:29 GMT ldelgass [4558] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) Fix lighting settings for components Fri, 18 Jul 2014 04:52:43 GMT ldelgass [4557] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) merge r4404 from trunk Fri, 18 Jul 2014 04:46:30 GMT ldelgass [4556] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) merge r4402 from trunk Fri, 18 Jul 2014 04:42:49 GMT ldelgass [4555] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) merge r4166 from trunk Fri, 18 Jul 2014 04:41:30 GMT ldelgass [4554] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) merge r4165 from trunk Fri, 18 Jul 2014 04:33:01 GMT ldelgass [4553] * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) Fix for outline Fri, 18 Jul 2014 04:20:41 GMT ldelgass [4552] * branches/1.3 (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) merge r4123 from trunk Fri, 18 Jul 2014 03:19:45 GMT ldelgass [4551] * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) fix background setting in nanovis Fri, 18 Jul 2014 03:12:29 GMT ldelgass [4550] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/vtkvolumeviewer.tcl (modified) merge background settings from trunk Fri, 18 Jul 2014 02:24:20 GMT ldelgass [4549] * branches/1.3 (modified) update mergeinfo Fri, 18 Jul 2014 02:20:51 GMT ldelgass [4548] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) merge r3947 from trunk Fri, 18 Jul 2014 02:12:39 GMT ldelgass [4547] * branches/1.3 (modified) * branches/1.3/gui/scripts/flowvisviewer.tcl (modified) merge r3940 from trunk Fri, 18 Jul 2014 01:51:37 GMT ldelgass [4546] * branches/1.3/gui/scripts/isomarker.tcl (modified) update isomarker to trunk version Fri, 18 Jul 2014 00:57:33 GMT ldelgass [4545] * branches/1.3/src/core/Makefile.in (modified) merge fix for Makefile rule from trunk Fri, 18 Jul 2014 00:44:09 GMT ldelgass [4544] * branches/1.3/Makefile.in (modified) Sync with trunk (whitespace) Fri, 18 Jul 2014 00:36:48 GMT ldelgass [4543] * trunk/examples/app-fermi/Makefile.in (modified) merge from 1.3 branch Thu, 17 Jul 2014 22:23:02 GMT ldelgass [4542] * trunk/gui/scripts/vtkisosurfaceviewer.tcl (modified) fix another mismerge Thu, 17 Jul 2014 22:19:45 GMT ldelgass [4541] * trunk/gui/scripts/vtkisosurfaceviewer.tcl (modified) fix another mismerge Thu, 17 Jul 2014 22:13:39 GMT ldelgass [4540] * trunk/gui/scripts/vtkisosurfaceviewer.tcl (modified) Fix missed rename Thu, 17 Jul 2014 21:56:59 GMT ldelgass [4539] * trunk/gui/scripts/vtkisosurfaceviewer.tcl (modified) fix typo Thu, 17 Jul 2014 21:08:48 GMT ldelgass [4538] * branches/1.3 (modified) * branches/1.3/gui/scripts/vtksurfaceviewer.tcl (modified) merge r4537 from trunk Thu, 17 Jul 2014 21:07:05 GMT ldelgass [4537] * trunk/gui/scripts/vtksurfaceviewer.tcl (modified) rename -surfaceoutline to -outline setting, since outline is of ... Thu, 17 Jul 2014 20:49:04 GMT ldelgass [4536] * trunk/packages/vizservers/configure.in (modified) fix comment Thu, 17 Jul 2014 20:44:41 GMT ldelgass [4535] * trunk/gui/scripts/vtkmeshviewer.tcl (modified) sync with mesh viewer in 1.3 branch Thu, 17 Jul 2014 20:39:52 GMT ldelgass [4534] * branches/1.3/gui/scripts/vtkmeshviewer.tcl (modified) Style settings for mesh should not include "polydata", since there is ... Thu, 17 Jul 2014 18:48:21 GMT gah [4533] * branches/1.3/gui/scripts/vtkheightmapviewer.tcl (modified) * branches/1.3/gui/scripts/vtkisosurfaceviewer.tcl (modified) * branches/1.3/tester/scripts/Makefile.in (modified) * branches/1.3/tester/scripts/auto.tcl (added) * branches/1.3/tester/scripts/main.tcl (modified) update regression tester Thu, 17 Jul 2014 17:36:11 GMT ldelgass [4532] * branches/1.3/gui/scripts/images/layers.png (added) Add back layers image Thu, 17 Jul 2014 15:50:36 GMT gah [4531] * branches/1.3/gui/scripts/images/layers.png (deleted) * branches/1.3/gui/scripts/nanovisviewer.tcl (modified) * branches/1.3/gui/scripts/resources.tcl (deleted) * branches/1.3/gui/scripts/tool.tcl (modified) test nanovisviewer against old 1.2 server Thu, 17 Jul 2014 09:57:21 GMT ldelgass [4530] * branches/1.3 (modified) * branches/1.3/packages/vizservers/Makefile.in (modified) * branches/1.3/packages/vizservers/configure (modified) * branches/1.3/packages/vizservers/configure.in (modified) * branches/1.3/packages/vizservers/nanovis/nvconf.h.in (modified) * branches/1.3/packages/vizservers/pymolproxy/Makefile.in (modified) * branches/1.3/packages/vizservers/start_viz.sh.in (deleted) * branches/1.3/packages/vizservers/vtkvis/LIC.cpp (modified) * branches/1.3/packages/vizservers/vtkvis/LIC.h (modified) * branches/1.3/packages/vizservers/vtkvis/Makefile.in (modified) * branches/1.3/packages/vizservers/vtkvis/cf (copied) * branches/1.3/packages/vizservers/vtkvis/configure (copied) * branches/1.3/packages/vizservers/vtkvis/configure.in (copied) Merge r4024,4049,4051-4052,4060 from trunk