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

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

projects / sonarqube.git / commit

summary | shortlog | log | commit | commitdiff | tree
(parent: c4ff8b4) | patch

author	Simon Brandhof <simon.brandhof@gmail.com>
	Thu, 12 Jul 2012 16:38:42 +0000 (18:38 +0200)
committer	Simon Brandhof <simon.brandhof@gmail.com>
	Thu, 12 Jul 2012 16:38:52 +0000 (18:38 +0200)
commit	a2a1a000cb251bd814d1977cd7037a3e69681dd2
tree	916fed94e97bc2d01a7c22df8717bb8d3857e33b	tree \| snapshot
parent	c4ff8b4179f9d8701085179ca54aa6e17547bbba	commit \| diff

Merge branch 'master' of /Users/sbrandhof/projects/github/sonar with conflicts.

plugins/sonar-l10n-en-plugin/src/main/resources/org/sonar/l10n/core.properties		diff \| blob \| history
sonar-plugin-api/src/test/java/org/sonar/api/measures/MeasureTest.java		diff \| blob \| history
sonar-server/src/main/webapp/WEB-INF/app/views/bulk_deletion/index.html.erb		diff \| blob \| history

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