Skip to content

Commit

Permalink
Merge branch 'next' into ParmuzinAlexander-master
Browse files Browse the repository at this point in the history
  • Loading branch information
OlivierBlanvillain committed Oct 7, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
2 parents 7b351ca + 10875ca commit 39df940
Showing 48 changed files with 7,003 additions and 7,287 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -13,3 +13,4 @@ leelaz
src/main/resources/META-INF
target
leelaz_opencl_tuning
lizzie.sh
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Active developmoent is on the next branch! Not master. Please clone next when contributing!
# Active development is on the next branch! Not master. Please clone next when contributing!

TODO: add more specific contributing guidelines. In general...

115 changes: 0 additions & 115 deletions doc/plugin.md

This file was deleted.

19 changes: 0 additions & 19 deletions doc/theme.md

This file was deleted.

26 changes: 26 additions & 0 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -22,6 +22,9 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
<compilerArgs>
<arg>-Xlint:all</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
@@ -52,6 +55,15 @@
</execution>
</executions>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.9</version>
<configuration>
<!-- Required to get the test failure reports in stdout -->
<useFile>false</useFile>
</configuration>
</plugin>
</plugins>
</build>

@@ -63,5 +75,19 @@
<version>20180130</version>
</dependency>

<!-- https://mvnrepository.com/artifact/junit/junit -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.11</version>
<scope>test</scope>
</dependency>

<!-- https://mvnrepository.com/artifact/com.jhlabs/filters -->
<dependency>
<groupId>com.jhlabs</groupId>
<artifactId>filters</artifactId>
<version>2.0.235</version>
</dependency>
</dependencies>
</project>
59 changes: 0 additions & 59 deletions src/main/java/com/jhlabs/image/AbstractBufferedImageOp.java

This file was deleted.

Loading
Oops, something went wrong.

0 comments on commit 39df940

Please sign in to comment.