Diff
Modified: branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog (161018 => 161019)
--- branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/_javascript_Core/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1,3 +1,16 @@
+2013-12-23 Matthew Hanson <[email protected]>
+
+ Merge 161003: <rdar://problem/15719584>
+
+ 2013-12-23 Lucas Forschler <[email protected]>
+
+ <rdar://problem/15682948> Update copyright strings
+
+ Reviewed by Dan Bernstein.
+
+ * Info.plist:
+ * _javascript_Core.vcxproj/_javascript_Core.resources/Info.plist:
+
2013-12-17 Matthew Hanson <[email protected]>
Merge the patch attached to <rdar://problem/15684269>
Modified: branches/safari-537.74-branch/Source/_javascript_Core/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/_javascript_Core/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/_javascript_Core/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 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-2014 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>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.resources/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.resources/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/_javascript_Core/_javascript_Core.vcxproj/_javascript_Core.resources/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>_javascript_Core</string>
<key>CFBundleGetInfoString</key>
- <string>530, Copyright 2003-2013 Apple Inc.</string>
+ <string>530, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple._javascript_Core</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebCore/ChangeLog (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebCore/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1,3 +1,15 @@
+2013-12-23 Matthew Hanson <[email protected]>
+
+ Merge 161003: <rdar://problem/15719584>
+
+ 2013-12-23 Lucas Forschler <[email protected]>
+
+ <rdar://problem/15682948> Update copyright strings
+
+ Reviewed by Dan Bernstein
+
+ * Info.plist:
+
2013-12-19 Matthew Hanson <[email protected]>
Merge r160898: <rdar://problems/15709940>
Modified: branches/safari-537.74-branch/Source/WebCore/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebCore/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebCore/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 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>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 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>
<key>CFBundleIdentifier</key>
<string>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit/mac/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1,3 +1,15 @@
+2013-12-23 Matthew Hanson <[email protected]>
+
+ Merge 161003: <rdar://problem/15719584>
+
+ 2013-12-23 Lucas Forschler <[email protected]>
+
+ <rdar://problem/15682948> Update copyright strings
+
+ Reviewed by Dan Bernstein.
+
+ * Info.plist:
+
2013-12-11 Lucas Forschler <[email protected]>
Merge r159460
Modified: branches/safari-537.74-branch/Source/WebKit/mac/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit/mac/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit/mac/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit/win/ChangeLog (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit/win/ChangeLog 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit/win/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1,3 +1,12 @@
+2013-12-23 Matthew Hanson <[email protected]>
+
+ Update copyright strings.
+ This is a drive-by change in addition to those made in r161003 on trunk.
+
+ Reviewed by Lucas Forschler.
+
+ * win/WebKit.resources/Info.plist:
+
2013-12-11 Lucas Forschler <[email protected]>
Merge r160184
Modified: branches/safari-537.74-branch/Source/WebKit/win/WebKit.resources/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit/win/WebKit.resources/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit/win/WebKit.resources/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>WebKit</string>
<key>CFBundleGetInfoString</key>
- <string>522+, Copyright 2003-2009 Apple Inc.</string>
+ <string>522+, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.WebKit</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/ChangeLog (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/ChangeLog 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1,3 +1,29 @@
+2013-12-23 Matthew Hanson <[email protected]>
+
+ Merge 161003: <rdar://problem/15719584>
+
+ 2013-12-23 Lucas Forschler <[email protected]>
+
+ <rdar://problem/15682948> Update copyright strings
+
+ Reviewed by Dan Bernstein
+
+ * DatabaseProcess/EntryPoint/mac/LegacyProcess/Info.plist:
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService.Development/Info.plist:
+ * DatabaseProcess/EntryPoint/mac/XPCService/DatabaseService/Info.plist:
+ * Info.plist:
+ * NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info.plist:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-OSX.plist:
+ * NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info-iOS.plist:
+ * PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist:
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist:
+ * PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist:
+ * WebProcess/EntryPoint/mac/LegacyProcess/Info.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info-iOS.plist:
+ * WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist:
+
2013-12-11 Lucas Forschler <[email protected]>
Merge r160197
Modified: branches/safari-537.74-branch/Source/WebKit2/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -5,7 +5,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.WebKit.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/NetworkProcess/EntryPoint/mac/XPCService/NetworkService.Development/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/LegacyProcess/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -5,7 +5,7 @@
<key>CFBundleExecutable</key>
<string>${EXECUTABLE_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.WebKit.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/OfflineStorageProcess/EntryPoint/mac/XPCService/OfflineStorageService.Development/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -5,7 +5,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.WebKit.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.32-64.Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/PluginProcess/EntryPoint/mac/XPCService/PluginService.Development/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/SharedWorkerProcess/EntryPoint/mac/LegacyProcess/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/SharedWorkerProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/SharedWorkerProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -5,7 +5,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIdentifier</key>
<string>com.apple.WebKit.${PRODUCT_NAME}</string>
<key>CFBundleInfoDictionaryVersion</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/LegacyProcess/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -5,7 +5,7 @@
<key>CFBundleExecutable</key>
<string>${PRODUCT_NAME}</string>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleIconFile</key>
<string>${APP_ICON}</string>
<key>CFBundleIdentifier</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist (161018 => 161019)
--- branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/Source/WebKit2/WebProcess/EntryPoint/mac/XPCService/WebContentService.Development/Info.plist 2013-12-23 22:05:48 UTC (rev 161019)
@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>CFBundleGetInfoString</key>
- <string>${BUNDLE_VERSION}, Copyright 2003-2013 Apple Inc.</string>
+ <string>${BUNDLE_VERSION}, Copyright 2003-2014 Apple Inc.</string>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
Modified: branches/safari-537.74-branch/WebKitLibraries/ChangeLog (161018 => 161019)
--- branches/safari-537.74-branch/WebKitLibraries/ChangeLog 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/WebKitLibraries/ChangeLog 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1,3 +1,15 @@
+2013-12-23 Matthew Hanson <[email protected]>
+
+ Merge 161003: <rdar://problem/15719584>
+
+ 2013-12-23 Lucas Forschler <[email protected]>
+
+ <rdar://problem/15682948> Update copyright strings
+
+ Reviewed by Dan Bernstein.
+
+ * win/tools/scripts/COPYRIGHT-END-YEAR:
+
2013-12-11 Matthew Hanson <[email protected]>
Merge r154513
Modified: branches/safari-537.74-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR (161018 => 161019)
--- branches/safari-537.74-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR 2013-12-23 22:05:22 UTC (rev 161018)
+++ branches/safari-537.74-branch/WebKitLibraries/win/tools/scripts/COPYRIGHT-END-YEAR 2013-12-23 22:05:48 UTC (rev 161019)
@@ -1 +1 @@
-2013
+2014