[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:53:15 UTC 2009


The following commit has been merged in the debian/unstable branch:
commit 62b334172f811d982665c262629cf742219bd036
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 23 17:38:23 2002 +0000

    	Forgot to add WebPluginController back to the project after I had a project conflict.
    
            * WebKit.pbproj/project.pbxproj:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2436 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 53c58f3..2ceef2f 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-10-23  Chris Blumenberg  <cblu at apple.com>
 
+	Forgot to add WebPluginController back to the project after I had a project conflict.
+
+        * WebKit.pbproj/project.pbxproj:
+
+2002-10-23  Chris Blumenberg  <cblu at apple.com>
+
 	Added WebPluginController which controls and reacts to plug-in requests. Its owned by the WebFrame.
 
         * Plugins.subproj/WebPluginController.h: Added.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 53c58f3..2ceef2f 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-10-23  Chris Blumenberg  <cblu at apple.com>
 
+	Forgot to add WebPluginController back to the project after I had a project conflict.
+
+        * WebKit.pbproj/project.pbxproj:
+
+2002-10-23  Chris Blumenberg  <cblu at apple.com>
+
 	Added WebPluginController which controls and reacts to plug-in requests. Its owned by the WebFrame.
 
         * Plugins.subproj/WebPluginController.h: Added.
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 217ebdb..b0a203c 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -295,6 +295,7 @@
 				511D5554033FD51000CA2ACD,
 				933D659B03413FF2008635CE,
 				9311022A03667CF1008635CE,
+				8467275E0367158500CA2ACA,
 			);
 			isa = PBXHeadersBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -400,6 +401,7 @@
 				83E4AF49036652150000E506,
 				83E4AF4E036659440000E506,
 				9311022B03667CF1008635CE,
+				8467275F0367158500CA2ACA,
 			);
 			isa = PBXSourcesBuildPhase;
 			runOnlyForDeploymentPostprocessing = 0;
@@ -1576,6 +1578,30 @@
 //842
 //843
 //844
+		8467275C0367158500CA2ACA = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebPluginController.h;
+			refType = 4;
+		};
+		8467275D0367158500CA2ACA = {
+			fileEncoding = 30;
+			isa = PBXFileReference;
+			path = WebPluginController.m;
+			refType = 4;
+		};
+		8467275E0367158500CA2ACA = {
+			fileRef = 8467275C0367158500CA2ACA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
+		8467275F0367158500CA2ACA = {
+			fileRef = 8467275D0367158500CA2ACA;
+			isa = PBXBuildFile;
+			settings = {
+			};
+		};
 		848DFF410365F6FB00CA2ACA = {
 			children = (
 				F5F717220288493C018635CA,
@@ -1606,6 +1632,8 @@
 			children = (
 				848DFF840365FE6A00CA2ACA,
 				848DFF850365FE6A00CA2ACA,
+				8467275C0367158500CA2ACA,
+				8467275D0367158500CA2ACA,
 				83E4AF4B036659440000E506,
 				83E4AF4C036659440000E506,
 				848DFF860365FE6A00CA2ACA,

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list