source.dussan.org Git - sonarqube.git/commit

]> source.dussan.org Git - sonarqube.git/commit

projects / sonarqube.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: f653a7a 20f2ddd)

author	Simon Brandhof <simon.brandhof@sonarsource.com>
	Tue, 21 Oct 2014 09:37:25 +0000 (11:37 +0200)
committer	Simon Brandhof <simon.brandhof@sonarsource.com>
	Tue, 21 Oct 2014 09:37:25 +0000 (11:37 +0200)
commit	4e9cff5b91425c9a888f6e3b42b30528e92880fb
tree	f755cdcd3180fa073c49389654cdbc16f45544fa	tree \| snapshot
parent	f653a7a5221ec753bdb089c119dcd2b320368515	commit \| diff
parent	20f2ddd5f6033d74c9a9de7b865ee82c62ee7c72	commit \| diff

Merge remote-tracking branch 'remotes/origin/branch-4.5'

Conflicts:
sonar-plugin-api/src/main/java/org/sonar/api/utils/KeyValueFormat.java

sonar-plugin-api/pom.xml	diff1 \|	diff2 \|	blob \| history
sonar-plugin-api/src/main/java/org/sonar/api/measures/RangeDistributionBuilder.java	diff1 \|	diff2 \|	blob \| history

Continuous Inspection: https://github.com/SonarSource/sonarqube