tomcat.jndi
取消target
sdf
commit
修改忽略
saas
设备管理项目创建
asd
rtt
as
 asda
as
cc
Merge branch 'master' of https://github.com/calm04061/dqh-study into HEAD

Conflicts:
	java/eclipselink.jpa/.classpath
	java/eclipselink.jpa/.project
	java/eclipselink.jpa/.settings/org.eclipse.core.resources.prefs
	java/eclipselink.jpa/.settings/org.eclipse.jdt.core.prefs
	java/eclipselink.jpa/.settings/org.eclipse.m2e.core.prefs
	java/eclipselink.jpa/pom.xml
修改pom的parent
初步swing-osgi的思路
Merge remote-tracking branch 'origin/master1'

Conflicts:
	.gitignore