7u83 5c16434416 Merge origin/master ... Conflicts: nbproject/private/private.xml		2017-11-19 17:26:32 +01:00
..
configs	Ant files	2017-03-20 17:57:10 +01:00
private	Merge origin/master	2017-11-19 17:26:32 +01:00
build-impl.xml	Ant files	2017-03-20 17:57:10 +01:00
genfiles.properties	Ant files	2017-03-20 17:57:10 +01:00
jnlp-impl.xml	Ant files	2017-03-20 17:57:10 +01:00
project.properties	Indicators	2017-11-19 17:19:29 +01:00
project.xml	Ant files	2017-03-20 17:57:10 +01:00