Merge origin/master
This commit is contained in:
commit
ad9ed3f6d2
@ -1,8 +1,8 @@
|
||||
build.xml.data.CRC32=573ee386
|
||||
build.xml.data.CRC32=5eaaa012
|
||||
build.xml.script.CRC32=9c118765
|
||||
build.xml.stylesheet.CRC32=1707db4f@1.86.0.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=573ee386
|
||||
nbproject/build-impl.xml.data.CRC32=5eaaa012
|
||||
nbproject/build-impl.xml.script.CRC32=7458d665
|
||||
nbproject/build-impl.xml.stylesheet.CRC32=334708a0@1.86.0.1
|
||||
|
@ -12,7 +12,7 @@ build.test.classes.dir=${build.dir}/test/classes
|
||||
build.test.results.dir=${build.dir}/test/results
|
||||
build.web.dir=${build.dir}/web
|
||||
build.web.excludes=${build.classes.excludes}
|
||||
client.urlPart=
|
||||
client.urlPart=/Authentif
|
||||
compile.jsps=false
|
||||
conf.dir=${source.root}/conf
|
||||
debug.classpath=${build.classes.dir}:${javac.classpath}
|
||||
@ -69,7 +69,6 @@ javadoc.use=true
|
||||
javadoc.version=false
|
||||
javadoc.windowtitle=
|
||||
lib.dir=${web.docbase.dir}/WEB-INF/lib
|
||||
no.dependencies=false
|
||||
persistence.xml.dir=${conf.dir}
|
||||
platform.active=default_platform
|
||||
resource.dir=setup
|
||||
|
@ -21,10 +21,10 @@
|
||||
</web-module-libraries>
|
||||
<web-module-additional-libraries/>
|
||||
<source-roots>
|
||||
<root id="src.dir" name="Source Packages"/>
|
||||
<root id="src.dir"/>
|
||||
</source-roots>
|
||||
<test-roots>
|
||||
<root id="test.src.dir" name="Test Packages"/>
|
||||
<root id="test.src.dir"/>
|
||||
</test-roots>
|
||||
</data>
|
||||
</configuration>
|
||||
|
Loading…
x
Reference in New Issue
Block a user