Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
  • Loading branch information
ntherning committed Nov 1, 2015
2 parents c513d9a + 81c656d commit ef09190
Show file tree
Hide file tree
Showing 1,399 changed files with 41,149 additions and 3,168 deletions.
2 changes: 1 addition & 1 deletion cacerts/full/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.robovm</groupId>
<artifactId>robovm-cacerts-parent</artifactId>
<version>1.6.1-SNAPSHOT</version>
<version>1.8.0</version>
</parent>

<artifactId>robovm-cacerts-full</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cacerts/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.robovm</groupId>
<artifactId>robovm-parent</artifactId>
<version>1.6.1-SNAPSHOT</version>
<version>1.8.0</version>
</parent>

<artifactId>robovm-cacerts-parent</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion cocoatouch/pom.xml
Expand Up @@ -5,7 +5,7 @@
<parent>
<groupId>org.robovm</groupId>
<artifactId>robovm-parent</artifactId>
<version>1.6.1-SNAPSHOT</version>
<version>1.8.0</version>
</parent>

<artifactId>robovm-cocoatouch</artifactId>
Expand Down

0 comments on commit ef09190

Please sign in to comment.