Diff
Modified: branches/safari-603-branch/Source/_javascript_Core/ChangeLog (210436 => 210437)
--- branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/_javascript_Core/ChangeLog 2017-01-06 15:38:06 UTC (rev 210437)
@@ -1,3 +1,16 @@
+2017-01-06 Matthew Hanson <[email protected]>
+
+ Merge r210221. rdar://problem/29449474
+
+ 2017-01-01 Jeff Miller <[email protected]>
+
+ Update user-visible copyright strings to include 2017
+ https://bugs.webkit.org/show_bug.cgi?id=166278
+
+ Reviewed by Dan Bernstein.
+
+ * Info.plist:
+
2017-01-05 Matthew Hanson <[email protected]>
Merge r210282. rdar://problem/29760326
Modified: branches/safari-603-branch/Source/_javascript_Core/Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/_javascript_Core/Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/_javascript_Core/Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.; Copyright 1999-2001 Harri Porten <[email protected]>; Copyright 2001 Peter Kelly <[email protected]>; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.; Copyright 1999-2001 Harri Porten <[email protected]>; Copyright 2001 Peter Kelly <[email protected]>; Copyright 1997-2005 University of Cambridge; Copyright 1991, 2000, 2001 by Lucent Technologies.</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210436 => 210437)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-06 15:38:06 UTC (rev 210437)
@@ -1,3 +1,16 @@
+2017-01-06 Matthew Hanson <[email protected]>
+
+ Merge r210221. rdar://problem/29449474
+
+ 2017-01-01 Jeff Miller <[email protected]>
+
+ Update user-visible copyright strings to include 2017
+ https://bugs.webkit.org/show_bug.cgi?id=166278
+
+ Reviewed by Dan Bernstein.
+
+ * Info.plist:
+
2017-01-05 Matthew Hanson <[email protected]>
Merge r210372. rdar://problem/29870033
Modified: branches/safari-603-branch/Source/WebCore/Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebCore/Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebCore/Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.; Copyright 1997 Martin Jones <[email protected]>; Copyright 1998, 1999 Torben Weis <[email protected]>; Copyright 1998, 1999, 2002 Waldo Bastian <[email protected]>; Copyright 1998-2000 Lars Knoll <[email protected]>; Copyright 1999, 2001 Antti Koivisto <[email protected]>; Copyright 1999-2001 Harri Porten <[email protected]>; Copyright 2000 Simon Hausmann <[email protected]>; Copyright 2000, 2001 Dirk Mueller <[email protected]>; Copyright 2000, 2001 Peter Kelly <[email protected]>; Copyright 2000 Daniel Molkentin <[email protected]>; Copyright 2000 Stefan Schimanski <[email protected]>; 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-2017 Apple Inc.; Copyright 1997 Martin Jones <[email protected]>; Copyright 1998, 1999 Torben Weis <[email protected]>; Copyright 1998, 1999, 2002 Waldo Bastian <[email protected]>; Copyright 1998-2000 Lars Knoll <[email protected]>; Copyright 1999, 2001 Antti Koivisto <[email protected]>; Copyright 1999-2001 Harri Porten <[email protected]>; Copyright 2000 Simon Hausmann <[email protected]>; Copyright 2000, 2001 Dirk Mueller <[email protected]>; Copyright 2000, 2001 Peter Kelly <[email protected]>; Copyright 2000 Daniel Molkentin <[email protected]>; Copyright 2000 Stefan Schimanski <[email protected]>; 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>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-603-branch/Source/WebKit/mac/ChangeLog (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit/mac/ChangeLog 2017-01-06 15:38:06 UTC (rev 210437)
@@ -1,3 +1,16 @@
+2017-01-06 Matthew Hanson <[email protected]>
+
+ Merge r210221. rdar://problem/29449474
+
+ 2017-01-01 Jeff Miller <[email protected]>
+
+ Update user-visible copyright strings to include 2017
+ https://bugs.webkit.org/show_bug.cgi?id=166278
+
+ Reviewed by Dan Bernstein.
+
+ * Info.plist:
+
2017-01-05 Matthew Hanson <[email protected]>
Merge r210372. rdar://problem/29870033
Modified: branches/safari-603-branch/Source/WebKit/mac/Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit/mac/Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit/mac/Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-06 15:38:06 UTC (rev 210437)
@@ -1,3 +1,25 @@
+2017-01-06 Matthew Hanson <[email protected]>
+
+ Merge r210221. rdar://problem/29449474
+
+ 2017-01-01 Jeff Miller <[email protected]>
+
+ Update user-visible copyright strings to include 2017
+ https://bugs.webkit.org/show_bug.cgi?id=166278
+
+ Reviewed by Dan Bernstein.
+
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist:
+ * Info.plist:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist:
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist:
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist:
+
2017-01-05 Matthew Hanson <[email protected]>
Merge r210363. rdar://problem/19595567
Modified: branches/safari-603-branch/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>${PRODUCT_BUNDLE_IDENTIFIER}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX-10.9-10.10.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64-10.9-10.10.Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX-10.9-10.10.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -5,7 +5,7 @@
<key>CFBundleFollowParentLocalization</key>
<true/>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-OSX.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -5,7 +5,7 @@
<key>CFBundleFollowParentLocalization</key>
<true/>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist (210436 => 210437)
--- branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist 2017-01-06 15:38:06 UTC (rev 210437)
@@ -5,7 +5,7 @@
<key>CFBundleFollowParentLocalization</key>
<true/>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2016 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2017 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-603-branch/WebKitLibraries/ChangeLog (210436 => 210437)
--- branches/safari-603-branch/WebKitLibraries/ChangeLog 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/WebKitLibraries/ChangeLog 2017-01-06 15:38:06 UTC (rev 210437)
@@ -1,3 +1,16 @@
+2017-01-06 Matthew Hanson <[email protected]>
+
+ Merge r210221. rdar://problem/29449474
+
+ 2017-01 Jeff Miller <[email protected]>
+
+ Update user-visible copyright strings to include 2017
+ https://bugs.webkit.org/show_bug.cgi?id=166278
+
+ Reviewed by Dan Bernstein.
+
+ * win/tools/scripts/COPYRIGHT-END-YEAR:
+
2016-09-07 Daniel Bates <[email protected]>
Update WebKitSystemInterface
Modified: branches/safari-603-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR (210436 => 210437)
--- branches/safari-603-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR 2017-01-06 14:05:29 UTC (rev 210436)
+++ branches/safari-603-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR 2017-01-06 15:38:06 UTC (rev 210437)
@@ -1 +1 @@
-2016
+2017