diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2013-09-19 01:59:39 +0100 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2013-09-19 01:59:39 +0100 |
commit | 5a58f06dc8b6d190c3ef09aad49d0940f33f3ade (patch) | |
tree | a0d61ca9da1f4c87cc9f116593cf84b7546d91ea /javax/lang/model/element/ExecutableElement.java | |
parent | c270d7baa946d1b0827dbb8a4f955542835e7eee (diff) | |
parent | 0116515b19e73f3589092b47dbfe6acbccd811d4 (diff) | |
download | classpath-gtk3.tar.gz |
Merge branch 'master' of git.sv.gnu.org:/srv/git/classpath into gtk3gtk3
Conflicts:
ChangeLog
Diffstat (limited to 'javax/lang/model/element/ExecutableElement.java')
-rw-r--r-- | javax/lang/model/element/ExecutableElement.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javax/lang/model/element/ExecutableElement.java b/javax/lang/model/element/ExecutableElement.java index 389eff07e..a404962ad 100644 --- a/javax/lang/model/element/ExecutableElement.java +++ b/javax/lang/model/element/ExecutableElement.java @@ -1,5 +1,5 @@ /* ExecutableElement.java -- Represents a method, constructor or initialiser. - Copyright (C) 2012 Free Software Foundation, Inc. + Copyright (C) 2012, 2013 Free Software Foundation, Inc. This file is part of GNU Classpath. @@ -51,7 +51,7 @@ import javax.lang.model.type.TypeMirror; * @see javax.lang.model.type.ExecutableType */ public interface ExecutableElement - extends Element + extends Element, Parameterizable { /** |