[webkit-changes] [104997] branches/safari-534.54-branch

Fri, 13 Jan 2012 15:16:08 -0800

Title: [104997] branches/safari-534.54-branch

Diff

Modified: branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog (104996 => 104997)


--- branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/_javascript_Core/ChangeLog	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1,5 +1,17 @@
 2011-1-13  Lucas Forschler  <lforsch...@apple.com>
 
+    Merge 104269
+
+    2012-01-05  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10633760> Update copyright strings
+
+            Reviewed by Mark Rowe.
+
+            * Info.plist:
+
+2011-1-13  Lucas Forschler  <lforsch...@apple.com>
+
     Merge 104119
 
     2012-01-04  Mark Rowe  <mr...@apple.com>

Modified: branches/safari-534.54-branch/Source/_javascript_Core/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/_javascript_Core/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/_javascript_Core/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.; Copyright 1999-2001 Harri Porten &lt;por...@kde.org&gt;; Copyright 2001 Peter Kelly &lt;p...@post.com&gt;; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.; Copyright 1999-2001 Harri Porten &lt;por...@kde.org&gt;; Copyright 2001 Peter Kelly &lt;p...@post.com&gt;; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/Source/_javascript_Glue/ChangeLog (104996 => 104997)


--- branches/safari-534.54-branch/Source/_javascript_Glue/ChangeLog	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/_javascript_Glue/ChangeLog	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1,3 +1,15 @@
+2011-1-13  Lucas Forschler  <lforsch...@apple.com>
+
+    Merge 104269
+
+    2012-01-05  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10633760> Update copyright strings
+
+            Reviewed by Mark Rowe.
+
+            * Info.plist:
+
 2011-12-21  Oliver Hunt  <oli...@apple.com>
 
     Merged _javascript_Core and related changes from r99898-r102985

Modified: branches/safari-534.54-branch/Source/_javascript_Glue/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/_javascript_Glue/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/_javascript_Glue/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.</string>
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/Source/WebCore/ChangeLog (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebCore/ChangeLog	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebCore/ChangeLog	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1,3 +1,15 @@
+2011-1-13  Lucas Forschler  <lforsch...@apple.com>
+
+    Merge 104269
+
+    2012-01-05  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10633760> Update copyright strings
+
+            Reviewed by Mark Rowe.
+
+            * Info.plist:
+
 2012-01-13  Lucas Forschler  <lforsch...@apple.com>
 
         Roll-out r99999 (which is 104249 on branch)

Modified: branches/safari-534.54-branch/Source/WebCore/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebCore/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebCore/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.; Copyright 1997 Martin Jones &lt;mjo...@kde.org&gt;; Copyright 1998, 1999 Torben Weis &lt;w...@kde.org&gt;; Copyright 1998, 1999, 2002 Waldo Bastian &lt;bast...@kde.org&gt;; Copyright 1998-2000 Lars Knoll &lt;kn...@kde.org&gt;; Copyright 1999, 2001 Antti Koivisto &lt;koivi...@kde.org&gt;; Copyright 1999-2001 Harri Porten &lt;por...@kde.org&gt;; Copyright 2000 Simon Hausmann &lt;hausm...@kde.org&gt;; Copyright 2000, 2001 Dirk Mueller &lt;muel...@kde.org&gt;; Copyright 2000, 2001 Peter Kelly &lt;p...@post.com&gt;; Copyright 2000 Daniel Molkentin &lt;molken...@kde.org&gt;; Copyright 2000 Stefan Schimanski &lt;schi...@kde.org&gt;; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string&
 gt;
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.; Copyright 1997 Martin Jones &lt;mjo...@kde.org&gt;; Copyright 1998, 1999 Torben Weis &lt;w...@kde.org&gt;; Copyright 1998, 1999, 2002 Waldo Bastian &lt;bast...@kde.org&gt;; Copyright 1998-2000 Lars Knoll &lt;kn...@kde.org&gt;; Copyright 1999, 2001 Antti Koivisto &lt;koivi...@kde.org&gt;; Copyright 1999-2001 Harri Porten &lt;por...@kde.org&gt;; Copyright 2000 Simon Hausmann &lt;hausm...@kde.org&gt;; Copyright 2000, 2001 Dirk Mueller &lt;muel...@kde.org&gt;; Copyright 2000, 2001 Peter Kelly &lt;p...@post.com&gt;; Copyright 2000 Daniel Molkentin &lt;molken...@kde.org&gt;; Copyright 2000 Stefan Schimanski &lt;schi...@kde.org&gt;; Copyright 1998-2000 Netscape Communications Corporation; Copyright 1998, 1999, 2000 Thai Open Source Software Center Ltd and Clark Cooper; Copyright 2001, 2002 Expat maintainers.</string&g
 t;
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/Source/WebKit/mac/ChangeLog (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebKit/mac/ChangeLog	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebKit/mac/ChangeLog	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1,3 +1,15 @@
+2011-1-13  Lucas Forschler  <lforsch...@apple.com>
+
+    Merge 104269
+
+    2012-01-05  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10633760> Update copyright strings
+
+            Reviewed by Mark Rowe.
+
+            * Info.plist:
+
 2011-1-12  Lucas Forschler  <lforsch...@apple.com>
 
     Merge 94317

Modified: branches/safari-534.54-branch/Source/WebKit/mac/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebKit/mac/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebKit/mac/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.</string>
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/Source/WebKit2/ChangeLog (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebKit2/ChangeLog	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebKit2/ChangeLog	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1,5 +1,19 @@
 2011-1-13  Lucas Forschler  <lforsch...@apple.com>
 
+    Merge 104269
+
+    2012-01-05  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10633760> Update copyright strings
+
+            Reviewed by Mark Rowe.
+
+            * Info.plist:
+            * PluginProcess/Info.plist:
+            * WebProcess/Info.plist:
+
+2011-1-13  Lucas Forschler  <lforsch...@apple.com>
+
     Merge 104239
 
     2012-01-05  Anders Carlsson  <ander...@apple.com>

Modified: branches/safari-534.54-branch/Source/WebKit2/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebKit2/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebKit2/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.</string>
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/Source/WebKit2/PluginProcess/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebKit2/PluginProcess/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebKit2/PluginProcess/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -5,7 +5,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.</string>
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.WebKit.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/Source/WebKit2/WebProcess/Info.plist (104996 => 104997)


--- branches/safari-534.54-branch/Source/WebKit2/WebProcess/Info.plist	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/Source/WebKit2/WebProcess/Info.plist	2012-01-13 23:16:01 UTC (rev 104997)
@@ -5,7 +5,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${PRODUCT_NAME}</string>
 	<key>CFBundleGetInfoString</key>
-	<string>${BUNDLE_VERSION}, Copyright 2003-2011 Apple Inc.</string>
+	<string>${BUNDLE_VERSION}, Copyright 2003-2012 Apple Inc.</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.apple.${PRODUCT_NAME}</string>
 	<key>CFBundleInfoDictionaryVersion</key>

Modified: branches/safari-534.54-branch/WebKitLibraries/ChangeLog (104996 => 104997)


--- branches/safari-534.54-branch/WebKitLibraries/ChangeLog	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/WebKitLibraries/ChangeLog	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1,3 +1,15 @@
+2011-1-13  Lucas Forschler  <lforsch...@apple.com>
+
+    Merge 104269
+
+    2012-01-05  Dan Bernstein  <m...@apple.com>
+
+            <rdar://problem/10633760> Update copyright strings
+
+            Reviewed by Mark Rowe.
+
+            * win/tools/scripts/COPYRIGHT-END-YEAR:
+
 2011-1-12  Lucas Forschler  <lforsch...@apple.com>
 
     Merge 94317

Modified: branches/safari-534.54-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR (104996 => 104997)


--- branches/safari-534.54-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR	2012-01-13 23:13:20 UTC (rev 104996)
+++ branches/safari-534.54-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR	2012-01-13 23:16:01 UTC (rev 104997)
@@ -1 +1 @@
-2011
+2012

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes

Reply via email to