ddd
ddd
Merge branch 'master' of https://github.com/yuchuang0606/IndustryService.git
ddd
Merge branch 'master' of https://github.com/yuchuang0606/IndustryService.git
yc 2013-11-22 15:54:40
yc 2013-11-22 23:30:28
ddd
Merge branch 'master' of https://github.com/yuchuang0606/IndustryService.git
ddd
ddd
Merge branch 'master' of
https://github.com/yuchuang0606/IndustryService.git

Conflicts:
	IndustryService/src/model/Video.hbm.xml
	IndustryService/src/model/Video.java
Inconsistent merge state: could not find file MERGE_MSG in .git folder.
This file contains the commit message for a merge commit.
Merge remote-tracking branch 'origin/master'
yc 2013-11-25 9:08:59
ddd
Merge branch 'master' of
https://github.com/yuchuang0606/IndustryService.git

Conflicts:
	IndustryService/src/model/Software.java
	IndustryService/src/model/Video.java
Merge remote-tracking branch 'origin/master'

Conflicts:
	IndustryService/src/datacontrol/NotificationControl.java
	IndustryService/src/datacontrol/SoftwareControl.java
	IndustryService/src/datacontrol/VideoControl.java