xknxkn commit
Merge branch 'master' of https://github.com/xknxkn/xkntest
Merge branch 'master' of https://github.com/xknxkn/xkntest
Xinyu已修改
KardLu
Xinyu已修改
Update group1_score.c
add install
Merge branch 'master' of http://github.com/xknxkn/xkntest

Conflicts:
	hustgroup1/group1_score
	hustgroup1/group1_score.c
Merge branch 'master' of https://github.com/xknxkn/xkntest
add return 0
KardLu group1 Makefile changed
hyieeh已修改
change_4
Merge branch 'master' of http://github.com/xknxkn/xkntest
   linmiaomiao
hustgroup4
Merge branch 'master' of http://github.com/xknxkn/xkntest

Conflicts:
	hust_esd_score
	hustgroup1/group1_score
	hustgroup2/group1_score
	hustgroup3/group1_score
	hustgroup4/group1_score
	hustgroup5/group1_score
Merge branch 'master' of http://github.com/xknxkn/xkntest

Conflicts:
	hustgroup4/group1_score
hyieeh已修改