test add2
Merge branch 'pr2.1'

Conflicts:
	master/base_item1.png
pr2.2 test delete
test add pr2.3
add master
pr2.3
Merge branch 'master' into pr2.3
delete
no message
no message
protocol
protocol
master
Merge branch 'test1' into pr2.1

Conflicts:
	trunk/测试/测试_GIF.gif
	trunk2-烛堡/地图/C - 城镇/Z - 烛堡/base_item1.png
	trunk2-烛堡/地图/C - 城镇/Z - 烛堡/base_item2.png