diff options
author | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-08-02 20:12:05 +0000 |
---|---|---|
committer | Andrew John Hughes <gnu_andrew@member.fsf.org> | 2005-08-02 20:12:05 +0000 |
commit | 33bace404a240c1335ab1f6e95bd6616e22c0ecd (patch) | |
tree | 004ab1587e14d3df272c6944ce325d3584b95aa5 /resource | |
parent | d30622846e00f908cb5d4beac7de4e5e78dcd630 (diff) | |
download | classpath-33bace404a240c1335ab1f6e95bd6616e22c0ecd.tar.gz |
2005-08-02 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Merge of HEAD --> generics-branch for 2005/06/05 - 2005/07/31.
See patch on classpath-patches@gnu.org for a full ChangeLog.
Diffstat (limited to 'resource')
-rw-r--r-- | resource/gnu/java/awt/peer/gtk/font.properties | 4 | ||||
-rw-r--r-- | resource/java/security/classpath.security | 4 | ||||
-rw-r--r-- | resource/org/ietf/jgss/MessagesBundle.properties | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/resource/gnu/java/awt/peer/gtk/font.properties b/resource/gnu/java/awt/peer/gtk/font.properties index 29bd0bca1..3687ec334 100644 --- a/resource/gnu/java/awt/peer/gtk/font.properties +++ b/resource/gnu/java/awt/peer/gtk/font.properties @@ -15,8 +15,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Classpath; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. # # Linking this library statically or dynamically with other modules is # making a combined work based on this library. Thus, the terms and diff --git a/resource/java/security/classpath.security b/resource/java/security/classpath.security index cd1223bee..c8e9dac94 100644 --- a/resource/java/security/classpath.security +++ b/resource/java/security/classpath.security @@ -15,8 +15,8 @@ # # You should have received a copy of the GNU General Public License # along with GNU Classpath; see the file COPYING. If not, write to the -# Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA -# 02111-1307 USA. +# Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA +# 02110-1301 USA. # # Linking this library statically or dynamically with other modules is # making a combined work based on this library. Thus, the terms and diff --git a/resource/org/ietf/jgss/MessagesBundle.properties b/resource/org/ietf/jgss/MessagesBundle.properties index af8247cbf..2d88225ee 100644 --- a/resource/org/ietf/jgss/MessagesBundle.properties +++ b/resource/org/ietf/jgss/MessagesBundle.properties @@ -15,7 +15,7 @@ # # You should have received a copy of the GNU General Public License # along with GNU Classpath; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 # USA # # Linking this library statically or dynamically with other modules is |