org.eclipse.wst.common.project.facet.core.xml
222 Bytes
-
Merge branch 'devel' into feature/maven · ad13358f
Conflicts: code/MoyaAuthModule/.classpath code/MoyaAuthModule/.settings/org.eclipse.jdt.core.prefs code/MoyaAuthModule/.settings/org.eclipse.wst.common.project.facet.core.xml code/MoyaAuthModuleClient/.settings/org.eclipse.jdt.core.prefs code/MoyaBeans/.classpath code/MoyaBeans/.settings/org.eclipse.jdt.core.prefs code/MoyaBeans/.settings/org.eclipse.wst.common.project.facet.core.xml code/MoyaBeansClient/.classpath code/MoyaBeansClient/.settings/org.eclipse.jdt.core.prefs code/MoyaDatabase/.classpath code/MoyaDatabase/.settings/org.eclipse.jdt.core.prefs code/MoyaDatabase/.settings/org.eclipse.wst.common.project.facet.core.xml code/MoyaTerminalWeb/.settings/org.eclipse.jdt.core.prefs code/MoyaUtilities/.classpath code/MoyaUtilities/.settings/org.eclipse.jdt.core.prefs code/MoyaWeb/.classpath code/MoyaWeb/.settings/org.eclipse.jdt.core.prefs
Juho Juopperi committed