diff options
| author | Julien HENRY <julien.henry@sonarsource.com> | 2014-12-01 16:57:56 +0100 |
|---|---|---|
| committer | Julien HENRY <julien.henry@sonarsource.com> | 2014-12-01 16:57:56 +0100 |
| commit | ab4232b3931437951dda555553fbd2ef1daada74 (patch) | |
| tree | 06fd470fb5a3a2966979bca39b45dfbf942045d3 /sonar-testing-harness | |
| parent | 312e3bd4cda4abfe595fd07202dbcf5817ba1410 (diff) | |
| parent | a2d5e82501f3ed8d96239845842770515f5087e6 (diff) | |
| download | sonarqube-ab4232b3931437951dda555553fbd2ef1daada74.tar.gz sonarqube-ab4232b3931437951dda555553fbd2ef1daada74.zip | |
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
Diffstat (limited to 'sonar-testing-harness')
0 files changed, 0 insertions, 0 deletions