]> source.dussan.org Git - sonarqube.git/commit
Merge remote-tracking branch 'origin/branch-4.5'
authorJulien HENRY <julien.henry@sonarsource.com>
Mon, 1 Dec 2014 15:57:56 +0000 (16:57 +0100)
committerJulien HENRY <julien.henry@sonarsource.com>
Mon, 1 Dec 2014 15:57:56 +0000 (16:57 +0100)
commitab4232b3931437951dda555553fbd2ef1daada74
tree06fd470fb5a3a2966979bca39b45dfbf942045d3
parent312e3bd4cda4abfe595fd07202dbcf5817ba1410
parenta2d5e82501f3ed8d96239845842770515f5087e6
Merge remote-tracking branch 'origin/branch-4.5'

Conflicts:
sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
sonar-plugin-api/src/main/java/org/sonar/api/component/ResourcePerspectives.java
sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java
13 files changed:
sonar-batch/src/main/java/org/sonar/batch/DefaultSensorContext.java
sonar-colorizer/src/main/java/org/sonar/colorizer/CodeColorizer.java
sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlCodeBuilder.java
sonar-colorizer/src/main/java/org/sonar/colorizer/HtmlOptions.java
sonar-colorizer/src/main/java/org/sonar/colorizer/InlineDocTokenizer.java
sonar-colorizer/src/main/java/org/sonar/colorizer/JavaAnnotationTokenizer.java
sonar-colorizer/src/main/java/org/sonar/colorizer/JavaConstantTokenizer.java
sonar-colorizer/src/main/java/org/sonar/colorizer/LiteralTokenizer.java
sonar-colorizer/src/main/java/org/sonar/colorizer/MultilinesDocTokenizer.java
sonar-core/src/main/java/org/sonar/core/component/ScanPerspectives.java
sonar-plugin-api/src/main/java/org/sonar/api/batch/SonarIndex.java
sonar-plugin-api/src/main/java/org/sonar/api/measures/CoreMetrics.java
sonar-plugin-api/src/main/java/org/sonar/api/web/CodeColorizerFormat.java