bbe279583d
Conflicts: .gitignore eclipse.spec sources |
||
---|---|---|
.gitignore | ||
eclipse-reconciler.sh | ||
eclipse.spec | ||
macros.eclipse | ||
org.eclipse.jdt.core-3.8.0.v_C03.pom | ||
org.eclipse.osgi-3.6.0.v20100517.pom | ||
org.eclipse.osgi.services-3.2.100.v20100503.pom | ||
pdebuild_old_info.sh | ||
pre360changelog.txt | ||
servlet-1.0.0-v20070606.pom | ||
sources |