Commit 5a51ecd3 authored by Piotr Wendykier's avatar Piotr Wendykier

Merge develop into feature/build_number

Conflicts:
	src/pl/edu/icm/visnow/system/main/VisNow.java
parents faa9e3db 20a33685

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

#Build Number for ANT. Do not edit!
#Tue May 09 13:19:51 CEST 2017
build.number=1300022
#Build Number for ANT. Do not edit!
#Mon May 21 13:23:52 CEST 2018
build.number=1300029
......@@ -73,19 +73,14 @@
<fileset dir="${basedir}/config_templates" includes="*.properties"></fileset>
</copy>
<mkdir dir="${dist.dir}/lib/native/linux/x86"/>
<copy todir="${dist.dir}/lib/native/linux/x86">
<fileset dir="${basedir}/native_libraries/linux/x86" includes="**/*.so"></fileset>
</copy>
<mkdir dir="${dist.dir}/lib/native/linux/x86_64"/>
<copy todir="${dist.dir}/lib/native/linux/x86_64">
<fileset dir="${basedir}/native_libraries/linux/x86_64" includes="**/*.so"></fileset>
</copy>
<mkdir dir="${dist.dir}/lib/native/windows/win32"/>
<copy todir="${dist.dir}/lib/native/windows/win32">
<fileset dir="${basedir}/native_libraries/windows/win32" includes="**/*.dll"></fileset>
<mkdir dir="${dist.dir}/lib/native/macOS/x86_64"/>
<copy todir="${dist.dir}/lib/native/macOS/x86_64">
<fileset dir="${basedir}/native_libraries/macOS/x86_64" includes="**/*.dylib"></fileset>
</copy>
<mkdir dir="${dist.dir}/lib/native/windows/win64"/>
......
No preview for this file type
libvtkCommonComputationalGeometry-8.1.so.1
\ No newline at end of file
libvtkCommonCore-8.1.so.1
\ No newline at end of file
libvtkCommonDataModel-8.1.so.1
\ No newline at end of file
libvtkCommonExecutionModel-8.1.so.1
\ No newline at end of file
libvtkCommonMath-8.1.so.1
\ No newline at end of file
libvtkCommonMisc-8.1.so.1
\ No newline at end of file
libvtkCommonSystem-8.1.so.1
\ No newline at end of file
libvtkCommonTransforms-8.1.so.1
\ No newline at end of file
libvtkFiltersCore-8.1.so.1
\ No newline at end of file
libvtkFiltersGeneral-8.1.so.1
\ No newline at end of file
libvtkIOCore-8.1.so.1
\ No newline at end of file
libvtkIOLegacy-8.1.so.1
\ No newline at end of file
libvtkIOXML-8.1.so.1
\ No newline at end of file
libvtkIOXMLParser-8.1.so.1
\ No newline at end of file
libvtkWrappingJava-8.1.so.1
\ No newline at end of file
libvtkexpat-8.1.so.1
\ No newline at end of file
libvtklz4-8.1.so.1
\ No newline at end of file
libvtksys-8.1.so.1
\ No newline at end of file
libvtkzlib-8.1.so.1
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.