Skip to content

Commit

Permalink
Merge pull request #63 from kmdouglass/FIX_Missing_AlicaLogger_Class
Browse files Browse the repository at this point in the history
Fixed the missing AlicaLogger class in the ALICA_for_SASS.jar
  • Loading branch information
kmdouglass committed Jan 19, 2018
2 parents 5d76fed + c041394 commit 5108b31
Show file tree
Hide file tree
Showing 8 changed files with 1,452 additions and 1,451 deletions.
7 changes: 4 additions & 3 deletions CHANGELOG.md
@@ -1,7 +1,7 @@
# Change Log
All notable changes to this project will be documented in this file.

## Unreleased
## [v0.6.1]
Contains [ALICA v0.2.5]

### Added
Expand All @@ -10,8 +10,8 @@ Contains [ALICA v0.2.5]
the per-frame-information about each emitter.

### Changed
- Bulky `ALICA_dev.jar` was replaced by `ALICA_for_SASS_v0_2_5.jar` which
reduced SASS jar size to 8MB.
- Bulky `ALICA_dev.jar` was replaced by `ALICA_for_SASS_v0_2_5.jar`
which reduced SASS jar size to 8MB.

## [v0.6.0]
Contains [ALICA v0.2.5]
Expand Down Expand Up @@ -239,3 +239,4 @@ Contains [ALICA v0.0.2]
[v0.5.0]: https://github.com/LEB-EPFL/SASS/releases/tag/v0.5.0
[v0.5.1]: https://github.com/LEB-EPFL/SASS/releases/tag/v0.5.1
[v0.6.0]: https://github.com/LEB-EPFL/SASS/releases/tag/v0.6.0
[v0.6.1]: https://github.com/LEB-EPFL/SASS/releases/tag/v0.6.1
2 changes: 1 addition & 1 deletion build-travis.xml
Expand Up @@ -3,7 +3,7 @@
<project name="SASS" default="default" basedir=".">
<description>Builds, tests, and runs the project SASS.</description>
<import file="nbproject/build-impl.xml"/>
<property name="store.jar.name" value="SASS_0.6.0.jar"/>
<property name="store.jar.name" value="SASS_0.6.1.jar"/>
<property name="store.dir" value="store"/>
<property name="store.jar" value="${store.dir}/${store.jar.name}"/>
<target name="-post-jar">
Expand Down
4 changes: 2 additions & 2 deletions build.xml
Expand Up @@ -3,8 +3,8 @@
<project name="SASS" default="default" basedir=".">
<description>Builds, tests, and runs the project SASS.</description>
<import file="nbproject/build-impl.xml"/>
<property name="pluginsDir" location="/home/kmdouglass/apps/Fiji.app/plugins" />
<property name="store.jar.name" value="SASS_0.6.0.jar"/>
<property name="pluginsDir" location="/home/douglass/apps/Fiji.app/plugins" />
<property name="store.jar.name" value="SASS_0.6.1.jar"/>
<property name="store.dir" value="store"/>
<property name="store.jar" value="${store.dir}/${store.jar.name}"/>
<target name="-post-jar">
Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Expand Up @@ -61,9 +61,9 @@
# built documents.
#
# The short X.Y version.
version = '0.6.0'
version = '0.6.1'
# The full version, including alpha/beta/rc tags.
release = '0.6.0'
release = '0.6.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2,840 changes: 1,420 additions & 1,420 deletions nbproject/build-impl.xml

Large diffs are not rendered by default.

16 changes: 8 additions & 8 deletions nbproject/genfiles.properties
@@ -1,8 +1,8 @@
build.xml.data.CRC32=2a536d25
build.xml.script.CRC32=1c9a5f06
build.xml.stylesheet.CRC32=8064a381@1.75.2.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=dd76ab7f
nbproject/build-impl.xml.script.CRC32=d5d9f6fc
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
build.xml.data.CRC32=2a536d25
build.xml.script.CRC32=1c9a5f06
build.xml.stylesheet.CRC32=8064a381@1.75.2.48
# This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
# Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
nbproject/build-impl.xml.data.CRC32=dd76ab7f
nbproject/build-impl.xml.script.CRC32=d5d9f6fc
nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48
30 changes: 15 additions & 15 deletions nbproject/project.xml
@@ -1,15 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>SASS-dev</name>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://www.netbeans.org/ns/project/1">
<type>org.netbeans.modules.java.j2seproject</type>
<configuration>
<data xmlns="http://www.netbeans.org/ns/j2se-project/3">
<name>SASS</name>
<source-roots>
<root id="src.dir"/>
</source-roots>
<test-roots>
<root id="test.src.dir"/>
</test-roots>
</data>
</configuration>
</project>
Binary file modified src/lib/ALICA_for_SASS_v0_2_5.jar
Binary file not shown.

0 comments on commit 5108b31

Please sign in to comment.