[Arianne-commits] stendhal_website/images/buttons merge_button.png, NONE, 1.1 merge_button.xcf, NONE, 1.1

[Katie R. <ky...@us...>]

Update of /cvsroot/arianne/stendhal_website/images/buttons
In directory sfp-cvsdas-4.v30.ch3.sourceforge.com:/tmp/cvs-serv435/images/buttons

Added Files:
	merge_button.png merge_button.xcf 
Log Message:
Add 'merge' button and xcf so we can use player heads for characters

--- NEW FILE: merge_button.png ---
(This appears to be a binary file; contents omitted.)

--- NEW FILE: merge_button.xcf ---
(This appears to be a binary file; contents omitted.)