Commit 7a17cbe2 authored by Luc Deschenaux's avatar Luc Deschenaux
Browse files

Merge branch 'master' of https://github.com/Elphel/imagej-elphel

parents b8af8a1c d14a3970
Loading
Loading
Loading
Loading
+8 −4
Original line number Diff line number Diff line
@@ -11,14 +11,18 @@
		<version>1.135</version>
		<relativePath />
	</parent>

<!-- 	
	<properties>
		<imagej.app.directory>/data/ImageJ/ImageJ</imagej.app.directory>
	</properties>
 -->
	<groupId>com.elphel</groupId>
 	<artifactId>imagej-elphel</artifactId>
<!-- 	<artifactId>Aberration_Calibration</artifactId> -->
	
	<version>1.0.0</version>

 	<name>plugins/ImageJ_Elphel.jar</name>
 	<name>plugins/imagej_elphel.jar</name>
<!-- 	<name>plugins/Aberration_Calibration.jar</name> -->
    <description>A Maven project implementing imagej-elphel plugin</description>

@@ -76,7 +80,6 @@
                    <!-- see http://jira.codehaus.org/browse/MNG-5346 -->
                   <skipErrorNoDescriptorsFound>true</skipErrorNoDescriptorsFound>
                </configuration>

                <executions>
                    <execution>
                        <id>mojo-descriptor</id>
@@ -85,6 +88,7 @@
                        </goals>
                    </execution>
                </executions>
	
            </plugin>
  			
			<plugin>
+2004 −171

File changed.

Preview size limit exceeded, changes collapsed.

+451 −41

File changed.

Preview size limit exceeded, changes collapsed.

+28 −1

File changed.

Preview size limit exceeded, changes collapsed.

+10726 −0

File added.

Preview size limit exceeded, changes collapsed.

Loading