simonbrandhof 9482c98cfd Merge branch 'release-2.9' ... Conflicts: archetypes/sonar-basic-plugin/pom.xml archetypes/sonar-gwt-plugin/pom.xml plugins/sonar-checkstyle-plugin/pom.xml plugins/sonar-cobertura-plugin/pom.xml plugins/sonar-core-gwt/pom.xml plugins/sonar-core-plugin/pom.xml plugins/sonar-cpd-plugin/pom.xml plugins/sonar-dbcleaner-plugin/pom.xml plugins/sonar-design-plugin/pom.xml plugins/sonar-findbugs-plugin/pom.xml plugins/sonar-googleanalytics-plugin/pom.xml plugins/sonar-pmd-plugin/pom.xml plugins/sonar-squid-java-plugin/pom.xml plugins/sonar-surefire-plugin/pom.xml pom.xml samples/pom.xml sonar-application/pom.xml sonar-batch-bootstrapper/pom.xml sonar-batch-maven-compat/pom.xml sonar-batch/pom.xml sonar-channel/pom.xml sonar-check-api/pom.xml sonar-colorizer/pom.xml sonar-core-maven-plugin/pom.xml sonar-core/pom.xml sonar-deprecated/pom.xml sonar-duplications/pom.xml sonar-graph/pom.xml sonar-gwt-api/pom.xml sonar-java-api/pom.xml sonar-markdown/pom.xml sonar-maven-plugin/pom.xml sonar-maven3-plugin/pom.xml sonar-plugin-api/pom.xml sonar-server/pom.xml sonar-squid/pom.xml sonar-testing-harness/pom.xml sonar-ws-client/pom.xml		2011-07-17 23:45:30 +02:00
..
src	SONAR-2497 Merge i18n plugin with core	2011-06-21 18:13:15 +02:00
assembly.xml
pom.xml	Merge branch 'release-2.9'	2011-07-17 23:45:30 +02:00