[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
cblu
cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:46:04 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit f27979cc140fe440fef80a7603df6c691d719ea5
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Tue Oct 1 15:41:56 2002 +0000
Fixed copyright comments.
* Plugins.subproj/WebBaseNetscapePluginView.h:
* Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
* Plugins.subproj/WebNetscapePluginDocumentView.h:
* Plugins.subproj/WebNetscapePluginDocumentView.m:
* Plugins.subproj/WebNetscapePluginEmbeddedView.h:
* Plugins.subproj/WebNetscapePluginEmbeddedView.m:
* Plugins.subproj/WebNullPluginView.h:
* Plugins.subproj/WebNullPluginView.m:
* Plugins.subproj/WebPlugin.h:
* Plugins.subproj/WebPlugin.m:
* Plugins.subproj/WebPluginDatabase.h:
* Plugins.subproj/WebPluginDatabase.m:
* Plugins.subproj/WebPluginNullEventSender.h:
* Plugins.subproj/WebPluginNullEventSender.m:
* Plugins.subproj/WebPluginStream.h:
* Plugins.subproj/WebPluginStream.m:
* Plugins.subproj/npapi.h:
* Plugins.subproj/npapi.m:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2214 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e2e4d44..9ada427 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2002-10-01 Chris Blumenberg <cblu at apple.com>
+
+ Fixed copyright comments.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
+ * Plugins.subproj/WebNetscapePluginDocumentView.h:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.h:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ * Plugins.subproj/WebNullPluginView.h:
+ * Plugins.subproj/WebNullPluginView.m:
+ * Plugins.subproj/WebPlugin.h:
+ * Plugins.subproj/WebPlugin.m:
+ * Plugins.subproj/WebPluginDatabase.h:
+ * Plugins.subproj/WebPluginDatabase.m:
+ * Plugins.subproj/WebPluginNullEventSender.h:
+ * Plugins.subproj/WebPluginNullEventSender.m:
+ * Plugins.subproj/WebPluginStream.h:
+ * Plugins.subproj/WebPluginStream.m:
+ * Plugins.subproj/npapi.h:
+ * Plugins.subproj/npapi.m:
+
2002-10-01 Ken Kocienda <kocienda at apple.com>
Many changes to coincide with API work in WebFoundation. Most of the modifications
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e2e4d44..9ada427 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,26 @@
+2002-10-01 Chris Blumenberg <cblu at apple.com>
+
+ Fixed copyright comments.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.h:
+ * Plugins.subproj/WebBaseNetscapePluginViewPrivate.h:
+ * Plugins.subproj/WebNetscapePluginDocumentView.h:
+ * Plugins.subproj/WebNetscapePluginDocumentView.m:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.h:
+ * Plugins.subproj/WebNetscapePluginEmbeddedView.m:
+ * Plugins.subproj/WebNullPluginView.h:
+ * Plugins.subproj/WebNullPluginView.m:
+ * Plugins.subproj/WebPlugin.h:
+ * Plugins.subproj/WebPlugin.m:
+ * Plugins.subproj/WebPluginDatabase.h:
+ * Plugins.subproj/WebPluginDatabase.m:
+ * Plugins.subproj/WebPluginNullEventSender.h:
+ * Plugins.subproj/WebPluginNullEventSender.m:
+ * Plugins.subproj/WebPluginStream.h:
+ * Plugins.subproj/WebPluginStream.m:
+ * Plugins.subproj/npapi.h:
+ * Plugins.subproj/npapi.m:
+
2002-10-01 Ken Kocienda <kocienda at apple.com>
Many changes to coincide with API work in WebFoundation. Most of the modifications
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
index 504f285..fd16b0a 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.h
@@ -1,5 +1,5 @@
-/*
- WebBaseNetscapePluginView.h
+/*
+ WebBaseNetscapePluginView.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h b/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
index b780c84..936605a 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginViewPrivate.h
@@ -1,10 +1,7 @@
-//
-// WebPluginViewPrivate.h
-// WebKit
-//
-// Created by Darin Adler on Tue Aug 27 2002.
-// Copyright (c) 2002 Apple Computer, Inc. All rights reserved.
-//
+/*
+ WebBaseNetscapePluginView.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <WebBaseNetscapePluginView.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.h b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.h
index 6792d28..a3c57e5 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.h
@@ -1,10 +1,7 @@
-//
-// WebNetscapePluginDocumentView.h
-// WebKit
-//
-// Created by Administrator on Mon Sep 30 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ WebNetscapePluginDocumentView.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <AppKit/AppKit.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
index b4b7bf5..7809a20 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginDocumentView.m
@@ -1,10 +1,7 @@
-//
-// WebNetscapePluginDocumentView.m
-// WebKit
-//
-// Created by Administrator on Mon Sep 30 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ WebNetscapePluginDocumentView.m
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <WebKit/WebController.h>
#import <WebKit/WebDataSource.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h
index 24bffa8..9a23341 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.h
@@ -1,10 +1,7 @@
-//
-// WebNetscapePluginEmbeddedView.h
-// WebKit
-//
-// Created by Administrator on Mon Sep 30 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ WebNetscapePluginEmbeddedView.h
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <AppKit/AppKit.h>
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
index 8dd9b50..ed170bc 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginEmbeddedView.m
@@ -1,10 +1,7 @@
-//
-// WebNetscapePluginEmbeddedView.m
-// WebKit
-//
-// Created by Administrator on Mon Sep 30 2002.
-// Copyright (c) 2002 __MyCompanyName__. All rights reserved.
-//
+/*
+ WebNetscapePluginEmbeddedView.m
+ Copyright 2002, Apple, Inc. All rights reserved.
+*/
#import <WebKit/WebBaseNetscapePluginViewPrivate.h>
#import <WebKit/WebController.h>
@@ -56,16 +53,11 @@
if ([self window]){
[self start];
- }
-}
-
-- (void)start
-{
- [super start];
-
- if(URL){
- WebResourceRequest *request = [WebResourceRequest requestWithURL:URL];
- [self loadRequest:request inTarget:nil withNotifyData:nil];
+
+ if(URL){
+ WebResourceRequest *request = [WebResourceRequest requestWithURL:URL];
+ [self loadRequest:request inTarget:nil withNotifyData:nil];
+ }
}
}
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.h b/WebKit/Plugins.subproj/WebNullPluginView.h
index 0f03017..04b2335 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.h
+++ b/WebKit/Plugins.subproj/WebNullPluginView.h
@@ -1,5 +1,5 @@
/*
- WebNullPluginView.h
+ WebNullPluginView.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebNullPluginView.m b/WebKit/Plugins.subproj/WebNullPluginView.m
index 6d0470a..f8a142b 100644
--- a/WebKit/Plugins.subproj/WebNullPluginView.m
+++ b/WebKit/Plugins.subproj/WebNullPluginView.m
@@ -1,5 +1,5 @@
/*
- WebNullPluginView.mm
+ WebNullPluginView.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebPlugin.h b/WebKit/Plugins.subproj/WebPlugin.h
index 6f5ea7d..01c6437 100644
--- a/WebKit/Plugins.subproj/WebPlugin.h
+++ b/WebKit/Plugins.subproj/WebPlugin.h
@@ -1,27 +1,7 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ WebPlugin.h
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <Foundation/Foundation.h>
#import "npapi.h"
diff --git a/WebKit/Plugins.subproj/WebPlugin.m b/WebKit/Plugins.subproj/WebPlugin.m
index c2ad4bf..b16e602 100644
--- a/WebKit/Plugins.subproj/WebPlugin.m
+++ b/WebKit/Plugins.subproj/WebPlugin.m
@@ -1,27 +1,7 @@
/*
- * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ WebPlugin.m
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import "WebPlugin.h"
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.h b/WebKit/Plugins.subproj/WebPluginDatabase.h
index ab23904..8082840 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.h
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.h
@@ -1,27 +1,7 @@
/*
- * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ WebPluginDatabase.m
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <Foundation/Foundation.h>
diff --git a/WebKit/Plugins.subproj/WebPluginDatabase.m b/WebKit/Plugins.subproj/WebPluginDatabase.m
index b0d6fd4..983ca3e 100644
--- a/WebKit/Plugins.subproj/WebPluginDatabase.m
+++ b/WebKit/Plugins.subproj/WebPluginDatabase.m
@@ -1,27 +1,7 @@
/*
- * Copyright (C) 2001, 2002 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ WebPluginDatabase.m
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import <WebKit/WebDataSource.h>
#import <WebKit/WebKitLogging.h>
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.h b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
index c851359..3409713 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.h
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.h
@@ -1,5 +1,5 @@
/*
- WebPluginNullEventSender.h
+ WebPluginNullEventSender.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebPluginNullEventSender.m b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
index cdec999..d62b4e1 100644
--- a/WebKit/Plugins.subproj/WebPluginNullEventSender.m
+++ b/WebKit/Plugins.subproj/WebPluginNullEventSender.m
@@ -1,5 +1,5 @@
/*
- WebPluginNullEventSender.m
+ WebPluginNullEventSender.m
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebPluginStream.h b/WebKit/Plugins.subproj/WebPluginStream.h
index e912516..7c28e23 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.h
+++ b/WebKit/Plugins.subproj/WebPluginStream.h
@@ -1,5 +1,5 @@
/*
- WebPluginStream.h
+ WebPluginStream.h
Copyright 2002, Apple, Inc. All rights reserved.
*/
diff --git a/WebKit/Plugins.subproj/WebPluginStream.m b/WebKit/Plugins.subproj/WebPluginStream.m
index 05335be..39e48ce 100644
--- a/WebKit/Plugins.subproj/WebPluginStream.m
+++ b/WebKit/Plugins.subproj/WebPluginStream.m
@@ -1,10 +1,8 @@
/*
- WebPluginStream.m
+ WebPluginStream.m
Copyright (c) 2002, Apple, Inc. All rights reserved.
*/
-
-
#import <WebKit/WebBaseNetscapePluginView.h>
#import <WebKit/WebControllerPrivate.h>
#import <WebKit/WebDataSource.h>
diff --git a/WebKit/Plugins.subproj/npapi.h b/WebKit/Plugins.subproj/npapi.h
index c26a3d1..f35b856 100644
--- a/WebKit/Plugins.subproj/npapi.h
+++ b/WebKit/Plugins.subproj/npapi.h
@@ -1,27 +1,7 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ npapi.h
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#ifndef _NPAPI_H_
#define _NPAPI_H_
diff --git a/WebKit/Plugins.subproj/npapi.m b/WebKit/Plugins.subproj/npapi.m
index 029cf4a..ff9d09e 100644
--- a/WebKit/Plugins.subproj/npapi.m
+++ b/WebKit/Plugins.subproj/npapi.m
@@ -1,27 +1,7 @@
/*
- * Copyright (C) 2001 Apple Computer, Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
+ npapi.m
+ Copyright (c) 2002, Apple, Inc. All rights reserved.
+*/
#import "npapi.h"
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list