This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, gtk3 has been updated
via 5a58f06dc8b6d190c3ef09aad49d0940f33f3ade (commit)
via c270d7baa946d1b0827dbb8a4f955542835e7eee (commit)
via 83099328aea260f71cd0b14e23eac7844668a6f7 (commit)
via 0116515b19e73f3589092b47dbfe6acbccd811d4 (commit)
via 49cd8434d19c10e9128a8b19ddc7abfc909e760c (commit)
via 95e37667f914855bc945a53e37deed80662c8d68 (commit)
via 0e72820377fff08bf6ebec4e2b6b789b2feca22e (commit)
via 8cc669ead6cc6f8fd2e0d42f2cf54bb7eb0cc752 (commit)
from 848e38a011eb5ae3e0c715253f37d0b4a412b032 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -
commit 5a58f06dc8b6d190c3ef09aad49d0940f33f3ade
Merge: c270d7b 0116515
Author: Andrew John Hughes
Date: Thu Sep 19 01:59:39 2013 +0100
Merge branch 'master' of git.sv.gnu.org:/srv/git/classpath into gtk3
Conflicts:
ChangeLog
commit c270d7baa946d1b0827dbb8a4f955542835e7eee
Author: Andrew John Hughes
Date: Thu Sep 19 01:58:38 2013 +0100
Remove generated files.
2013-09-19 Andrew John Hughes
* include/config.h.in~,
* scripts/check_jni_methods.sh,
* tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java,
* tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap,
* tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.java,
* tools/generated/gnu/classpath/tools/gjdoc/expr/JavaRecognizer.smap,
* tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.java,
* tools/generated/gnu/classpath/tools/gjdoc/expr/JavaTokenTypes.txt,
* tools/gjdoc:
Remove generated files.
Signed-off-by: Andrew John Hughes
commit 83099328aea260f71cd0b14e23eac7844668a6f7
Merge: 49cd843 848e38a
Author: Andrew John Hughes
Date: Thu Sep 19 01:52:11 2013 +0100
Merge branch 'gtk3' of git.sv.gnu.org:/srv/git/classpath into gtk3
commit 49cd8434d19c10e9128a8b19ddc7abfc909e760c
Merge: b8b72a7 95e3766
Author: Andrew John Hughes
Date: Mon Aug 12 10:17:26 2013 +0100
Merge branch 'master' into gtk3 to bring in texinfo fix.
---
Summary of changes:
ChangeLog | 102 +
doc/cp-tools.texinfo |2 +-
include/config.h.in~ | 472 -
javax/lang/model/SourceVersion.java|5 +-
.../model/UnknownEntityException.java} | 34 +-
javax/lang/model/element/ElementKind.java |2 +
javax/lang/model/element/ExecutableElement.java|4 +-
javax/lang/model/element/PackageElement.java |4 +-
.../model/element/Parameterizable.java}| 30 +-
.../lang/model/element/QualifiedNameable.java | 23 +-
javax/lang/model/element/TypeElement.java |4 +-
.../element/UnknownAnnotationValueException.java |7 +-
.../model/element/UnknownElementException.java |8 +-
javax/lang/model/type/MirroredTypeException.java | 15 +-
javax/lang/model/type/TypeKind.java|4 +-
javax/lang/model/type/TypeVisitor.java | 13 +-
.../type/{ReferenceType.java => UnionType.java}| 24 +-
javax/lang/model/type/UnknownTypeException.java|7 +-
javax/lang/model/util/ElementFilter.java | 301 +++-
scripts/check_jni_methods.sh | 65 -
.../gnu/classpath/tools/gjdoc/expr/JavaLexer.java | 1962
.../gnu/classpath/tools/gjdoc/expr/JavaLexer.smap | 1280 -
.../classpath/tools/gjdoc/expr/JavaRecognizer.java | 1406 --
.../classpath/tools/gjdoc/expr/JavaRecognizer.smap | 987 --
.../classpath/tools/gjdoc/expr/JavaTokenTypes.java | 122 --
.../classpath/tools/gjdoc/expr/JavaTokenTypes.txt | 116 --
tools/gjdoc| 49 -
27 files changed, 507 insertions(+), 6541 deletions(-)
delete mode 100644 include/config.h.in~
copy javax/{management/JMRuntimeException.java =>
lang/model/UnknownEntityException.java} (70%)
copy javax/{annotation/processing/Completion.java =>
lang/model/element/Parameterizable.java} (77%)
copy java/lang/management/MemoryType.java =>
javax/lang/model/element/QualifiedNameable.java (80%)
copy javax/lang/model/type/{ReferenceType.java => UnionType.java} (78%)
delete mode 100644 scripts/check_jni_methods.sh
delete mode 100644
tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.java
delete mode 100644
tools/generated/gnu/classpath/tools/gjdoc/expr/JavaLexer.smap
delete mode 10