~yuanhung/nddRoadImport.git

ndd_roadimport

unknown

2014-04-08 c49c240521d24d5ed1ff2d07ac26ccdea0648600

refs
author	unknown <yuanhung@ximple.com.tw>
	Tuesday, April 8, 2014 15:14 +0800
committer	unknown <yuanhung@ximple.com.tw>
	Tuesday, April 8, 2014 15:14 +0800
commit	c49c240521d24d5ed1ff2d07ac26ccdea0648600
tree	732327aa09775b23cad461b008d129c7194b3f7f tree \| zip \| gz
parent	c66393b281c4810d5240971bcf6eba030439fe09 view \| diff 716c0c924e258506155aac628e3ed02eccb5af4b view \| diff

Merge branch 'origin/2.1.x'

Conflicts:
	xdgnjobs/ximple-jobcarrier/quartz.properties

2 files modified

3 files added

	xdgnjobs/ximple-jobcarrier/quartz.properties	6 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-jobcarrier/quartz_jobs_dmmsroadfee.xml	173 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties	5 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_dmmsroadfee.xml	173 ●●●●● diff \| view \| raw \| blame \| history
	xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/DMMSRoadfeeCalculateJob.java	1895 ●●●●● diff \| view \| raw \| blame \| history