Upstream merge.

This commit is contained in:
md_5
2015-01-05 14:32:01 +11:00
parent 436c6f2449
commit f2bf62789d
3 changed files with 15 additions and 21 deletions

View File

@@ -27,7 +27,7 @@ index 0000000000000000000000000000000000000000..00000000000000000000000000000000
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -0,0 +0,0 @@
<buildtag.suffix></buildtag.suffix>
<maven.compiler.target>1.6</maven.compiler.target>
</properties>
+ <parent>