My
啊
qq
redo
Merge branch 'master' of https://github.com/TianJianWang/tjian

Conflicts:
	.classpath
	WebRoot/WEB-INF/classes/com/tianjian/model/Project.class
	WebRoot/WEB-INF/classes/com/tianjian/model/Service.class
	WebRoot/WEB-INF/classes/com/tianjian/model/Service.hbm.xml
	WebRoot/WEB-INF/classes/com/tianjian/test/Test.class
	WebRoot/WEB-INF/classes/com/tianjian/util/FCKFilter.class
	WebRoot/WEB-INF/classes/com/tianjian/util/HibernateSessionFactory.class
	WebRoot/WEB-INF/classes/hibernate.cfg.xml
	WebRoot/WEB-INF/classes/struts.xml
	WebRoot/back/pages/addProject.jsp
	WebRoot/index.jsp
	src/com/tianjian/model/Project.java
	src/com/tianjian/model/Service.hbm.xml
	src/com/tianjian/model/Service.java
	src/com/tianjian/test/Test.java
	src/hibernate.cfg.xml
	src/struts.xml
chen hong biao
init project
啊
Init
add doc
Merge https://github.com/TianJianWang/tjian
aaagin
Merge branch 'master' of https://yimage@github.com/TianJianWang/tjian.git

Conflicts:
	WebRoot/index.jsp
	doc/文档目录.txt
a
Merge branch 'master' of https://github.com/TianJianWang/tjian

Conflicts:
	doc/文档目录.txt
Merge branch 'master' of https://github.com/TianJianWang/tjian

Conflicts:
	WebRoot/index.jsp
update index.html
js
ora
Merge branch 'master' of https://github.com/TianJianWang/tjian

Conflicts:
	WebRoot/WEB-INF/web.xml
	WebRoot/index.jsp