#
# ChangeLog for nanoscale/branches
#
# Generated by Trac 1.0.13
# Apr 25, 2024 5:54:54 AM

Tue, 15 Nov 2016 09:15:34 GMT ldelgass [6638]
	* nanoscale/branches/1.0 (modified)
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)

	merge r6630 from nanoscale trunk (timeout for pymolproxy)


Mon, 14 Nov 2016 21:27:00 GMT ldelgass [6627]
	* nanoscale/branches/1.0 (modified)

	update mergeinfo


Mon, 14 Nov 2016 21:25:19 GMT ldelgass [6626]
	* nanoscale/branches/1.0 (modified)

	update mergeinfo


Mon, 14 Nov 2016 21:21:21 GMT ldelgass [6625]
	* nanoscale/branches/1.0/aclocal.m4 (modified)
	* nanoscale/branches/1.0/cf (modified)
	* nanoscale/branches/1.0/configure.ac (modified)
	* nanoscale/branches/1.0/start_nanoscale.sh.in (modified)

	cleanup mergeinfo


Mon, 14 Nov 2016 21:17:38 GMT ldelgass [6623]
	* nanoscale/branches/1.0/Makefile.in (modified)
	* nanoscale/branches/1.0/server.c (modified)

	Merge selected nanoscale changes from trunk (by hand)


Mon, 14 Nov 2016 20:25:18 GMT ldelgass [6622]
	* nanoscale/branches/1.0 (modified)
	* nanoscale/branches/1.0/Makefile.in (modified)
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)
	* nanoscale/branches/1.0/server.c (modified)

	Merge fixes from nanoscale trunk (minus the config parser changes)


Tue, 30 Aug 2016 01:05:41 GMT ldelgass [6505]
	* nanoscale/branches/1.0 (modified)
	* nanoscale/branches/1.0/aclocal.m4 (modified)
	* nanoscale/branches/1.0/cf (modified)
	* nanoscale/branches/1.0/configure.ac (modified)
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)
	* nanoscale/branches/1.0/server.c (modified)
	* nanoscale/branches/1.0/start_nanoscale.sh.in (modified)

	merge from trunk


Fri, 17 Jun 2016 06:07:17 GMT ldelgass [6403]
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)

	comment


Thu, 21 Apr 2016 17:06:40 GMT ldelgass [6289]
	* nanoscale/branches/1.0 (modified)
	* nanoscale/branches/1.0/configure.ac (modified)
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)
	* nanoscale/branches/1.0/start_nanoscale.sh.in (modified)

	merge from nanoscale trunk


Wed, 23 Mar 2016 18:17:39 GMT ldelgass [6201]
	* nanoscale/branches/1.0/configure.ac (moved)

	rename configure.in to configure.ac


Mon, 23 Feb 2015 05:56:32 GMT ldelgass [5042]
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)

	Remove geovis config from release branch


Mon, 23 Feb 2015 05:54:26 GMT ldelgass [5041]
	* nanoscale/branches/1.0 (modified)
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)

	merge r4631 from trunk


Sat, 17 Jan 2015 20:25:07 GMT ldelgass [4932]
	* nanoscale/branches/1.0 (modified)
	* nanoscale/branches/1.0/renderservers.tcl.in (modified)

	merge r4931 from trunk


Tue, 19 Aug 2014 23:40:52 GMT ldelgass [4620]
	* nanoscale/branches/1.0 (copied)

	Create 1.0 release branch for nanoscale


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