Diff
Modified: branches/safari-601-branch/Tools/ChangeLog (193518 => 193519)
--- branches/safari-601-branch/Tools/ChangeLog 2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/ChangeLog 2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,5 +1,20 @@
2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+ Merge r189943. rdar://problem/23769735
+
+ 2015-09-17 Myles C. Maxfield <mmaxfi...@apple.com>
+
+ Update licence in r189890
+ https://bugs.webkit.org/show_bug.cgi?id=149306
+
+ Reviewed by Dean Jackson.
+
+ * FontWithFeatures/FontWithFeatures/FontCreator.cpp:
+ * FontWithFeatures/FontWithFeatures/FontCreator.h:
+ * FontWithFeatures/FontWithFeatures/main.cpp:
+
+2015-12-05 Matthew Hanson <matthew_han...@apple.com>
+
Merge r189890. rdar://problem/23769735
2015-09-16 Myles C. Maxfield <mmaxfi...@apple.com>
Modified: branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp (193518 => 193519)
--- branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp 2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.cpp 2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,10 +1,27 @@
-//
-// FontCreator.cpp
-// FontWithFeatures
-//
-// Created by Litherum on 9/15/15.
-// Copyright © 2015 Litherum. All rights reserved.
-//
+/*
+ * Copyright (C) 2015 Apple 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+ */
#include "FontCreator.h"
Modified: branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h (193518 => 193519)
--- branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h 2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/FontCreator.h 2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,10 +1,27 @@
-//
-// FontCreator.hpp
-// FontWithFeatures
-//
-// Created by Litherum on 9/15/15.
-// Copyright © 2015 Litherum. All rights reserved.
-//
+/*
+ * Copyright (C) 2015 Apple 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+ */
#ifndef FontCreator_h
#define FontCreator_h
Modified: branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp (193518 => 193519)
--- branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp 2015-12-05 18:30:14 UTC (rev 193518)
+++ branches/safari-601-branch/Tools/FontWithFeatures/FontWithFeatures/main.cpp 2015-12-05 18:30:17 UTC (rev 193519)
@@ -1,10 +1,27 @@
-//
-// main.cpp
-// FontWithFeatures
-//
-// Created by Litherum on 9/15/15.
-// Copyright © 2015 Litherum. All rights reserved.
-//
+/*
+ * Copyright (C) 2015 Apple 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 INC. AND ITS CONTRIBUTORS ``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 INC. OR ITS 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.
+ */
#include "FontCreator.h"
