syn myeclipse

laivi
2013-01-07
Merge branch 'master' of https://github.com/laivizhu/myGit.git

Conflicts:
	knowledge/.classpath
	knowledge/.mymetadata
	knowledge/.project
	knowledge/.settings/.jsdtscope
	knowledge/.settings/org.eclipse.core.resources.prefs
	knowledge/.settings/org.eclipse.jdt.core.prefs
	knowledge/.settings/org.eclipse.wst.common.component
	knowledge/.settings/org.eclipse.wst.common.project.facet.core.xml