Merge origin/master

This commit is contained in:
Edi
2019-07-05 19:09:43 +02:00
parent d4db36c418
commit 5996c744a2
9 changed files with 296 additions and 62 deletions
+3 -3
View File
@@ -1,8 +1,8 @@
build.xml.data.CRC32=b50c735c
build.xml.data.CRC32=20a1ec55
build.xml.script.CRC32=2d64e8d1
build.xml.stylesheet.CRC32=651128d4@1.77.1.1
# 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=b50c735c
nbproject/build-impl.xml.script.CRC32=74e621b3
nbproject/build-impl.xml.data.CRC32=20a1ec55
nbproject/build-impl.xml.script.CRC32=b4f5594b
nbproject/build-impl.xml.stylesheet.CRC32=99ea4b56@1.77.1.1