Ignore:
Timestamp:
Feb 13, 2012, 10:07:12 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b24 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk

  • trunk/openjdk/jdk/make/mkdemo/jfc/Font2DTest/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1999, 2007, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    3434
    3535DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
    36 DEMO_TOPFILES   = ./README.txt
     36DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
    3737DEMO_MAINCLASS  = $(DEMONAME)
    3838DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
  • trunk/openjdk/jdk/make/mkdemo/jfc/SwingApplet/Makefile

    r278 r309  
    11#
    2 # Copyright (c) 1997, 2002, Oracle and/or its affiliates. All rights reserved.
     2# Copyright (c) 1997, 2011, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
     
    3434
    3535DEMO_ROOT       = $(SHARE_SRC)/demo/jfc/$(DEMONAME)
    36 DEMO_TOPFILES   = ./README.txt
     36DEMO_TOPFILES   = ./README.txt ./$(DEMONAME).html
    3737DEMO_MAINCLASS  = $(DEMONAME)
    3838DEMO_DESTDIR    = $(DEMODIR)/jfc/$(DEMONAME)
Note: See TracChangeset for help on using the changeset viewer.