#
# ChangeLog for trunk/templates/merge.tmpl
#
# Generated by Trac 1.6
# 12/22/24 17:51:42

Wed, 20 May 2015 20:02:58 GMT Kris Deugau [727]
	* trunk/cgi-bin/main.cgi (modified)
	* trunk/templates/confmerge.tmpl (modified)
	* trunk/templates/merge.tmpl (modified)

	/trunk
	 Refine variable passing and template variable names on merge ...


Wed, 06 May 2015 22:06:10 GMT Kris Deugau [719]
	* trunk/templates/merge.tmpl (modified)

	/trunk
	 Scope options on emerge page weren't up to date.  'clearall' ...


Wed, 06 May 2015 21:55:14 GMT Kris Deugau [718]
	* trunk/templates/merge.tmpl (modified)

	/trunk
	 Tweak merge template


Wed, 06 May 2015 21:28:38 GMT Kris Deugau [717]
	* trunk/cgi-bin/main.cgi (modified)
	* trunk/templates/merge.tmpl (added)

	/trunk
	 Begin committing "merge/extend blocks".  See #8.

	 This ...