summaryrefslogtreecommitdiff
path: root/jpeg
diff options
context:
space:
mode:
authorJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 15:01:35 +0100
committerJens-Heiner Rechtien <hr@openoffice.org>2010-02-12 15:01:35 +0100
commit72e939d8ed5c57400a439d406586666faf6b7b2b (patch)
treebaba24818a4578b9766dd27cd3e96a3a35ae1929 /jpeg
parent270a926584edf395c0839eb68e2722e9e52d48c9 (diff)
changefileheader2: #i109125#: change source file copyright notice from Sun Microsystems to Oracle; remove CVS style keywords (RCSfile, Revision)
Diffstat (limited to 'jpeg')
-rw-r--r--jpeg/jpeg-6b.patch8
-rw-r--r--jpeg/makefile.mk6
2 files changed, 2 insertions, 12 deletions
diff --git a/jpeg/jpeg-6b.patch b/jpeg/jpeg-6b.patch
index c7c96a3eb736..c1a0f8010669 100644
--- a/jpeg/jpeg-6b.patch
+++ b/jpeg/jpeg-6b.patch
@@ -150,16 +150,10 @@
--- misc/jpeg-6b/makefile.mk 2009-03-19 11:30:46.000000000 +0100
+++ misc/build/jpeg-6b/makefile.mk 2009-03-19 11:30:30.000000000 +0100
-@@ -1 +1,82 @@
+@@ -1 +1,76 @@
-dummy
+#*************************************************************************
+#
-+# $RCSfile: makefile.mk,v $
-+#
-+# $Revision: 1.5 $
-+#
-+# last change: $Author: thb $ $Date: 2001/08/14 12:53:46 $
-+#
+# Copyright according the GNU Public License.
+#
+#*************************************************************************
diff --git a/jpeg/makefile.mk b/jpeg/makefile.mk
index b02480b118d6..0f5f5e0aba64 100644
--- a/jpeg/makefile.mk
+++ b/jpeg/makefile.mk
@@ -2,14 +2,10 @@
#
# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
#
-# Copyright 2008 by Sun Microsystems, Inc.
+# Copyright 2000, 2010 Oracle and/or its affiliates.
#
# OpenOffice.org - a multi-platform office productivity suite
#
-# $RCSfile: makefile.mk,v $
-#
-# $Revision: 1.5 $
-#
# This file is part of OpenOffice.org.
#
# OpenOffice.org is free software: you can redistribute it and/or modify