]> source.dussan.org Git - sonarqube.git/commit
projects / sonarqube.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 46d6957 40ef7ce)
Merge remote-tracking branch 'remotes/origin/branch-4.5'
authorSimon Brandhof <simon.brandhof@sonarsource.com>
Mon, 6 Oct 2014 08:13:12 +0000 (10:13 +0200)
committerSimon Brandhof <simon.brandhof@sonarsource.com>
Mon, 6 Oct 2014 08:13:12 +0000 (10:13 +0200)
commit3e4cb28c2f482caf3fad21092d4acf7609a702c6
treea093fbe2d68c6a91266b84f968ccef4dcf2f48e9tree | snapshot
parent46d6957730741f64a75b0b9404395bd5bc5d4cd4commit | diff
parent40ef7ce47f9400d88d351db0bf7e6c8dd7abba68commit | diff
Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
sonar-plugin-api/src/main/java/org/sonar/api/batch/SensorContext.java
sonar-plugin-api/src/main/java/org/sonar/api/batch/sensor/SensorContext.java
server/sonar-server/src/main/java/org/sonar/server/design/PackageDesignWidget.java diff1 | | blob | history
server/sonar-server/src/main/resources/org/sonar/server/design/package_design.html.erb diff1 | | blob | history
sonar-core/src/main/resources/org/sonar/l10n/core.properties diff1 | diff2 | blob | history
Continuous Inspection: https://github.com/SonarSource/sonarqube