summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMinh Nguyễn <mxn@1ec5.org>2016-01-05 14:01:58 -0800
committerMinh Nguyễn <mxn@1ec5.org>2016-01-05 14:01:58 -0800
commit1a501d4ec43fed7f5222610335b16bd47f515cef (patch)
treefeb24d105cc4044dfa379f81585e5ecae929dd21
parentbc6054152ca4d78568738ecd92f63d8d88d271fe (diff)
downloadqtlocation-mapboxgl-1a501d4ec43fed7f5222610335b16bd47f515cef.tar.gz
Happy new year!
-rw-r--r--.jazzy.yaml2
-rw-r--r--LICENSE.md2
-rw-r--r--ios/app/app-info.plist2
-rw-r--r--ios/benchmark/app-info.plist2
-rw-r--r--platform/android/MapboxGLAndroidSDK/build.gradle2
-rw-r--r--test/ios/LaunchScreen.xib2
6 files changed, 6 insertions, 6 deletions
diff --git a/.jazzy.yaml b/.jazzy.yaml
index 35c4e9a8ec..9d73f547de 100644
--- a/.jazzy.yaml
+++ b/.jazzy.yaml
@@ -3,7 +3,7 @@ author_name: Mapbox
author_url: https://www.mapbox.com/
github_url: https://github.com/mapbox/mapbox-gl-native
dash_url: https://www.mapbox.com/ios-sdk/docsets/Mapbox.xml
-copyright: '© 2014–2015 [Mapbox](https://www.mapbox.com/). See [license](https://github.com/mapbox/mapbox-gl-native/blob/master/LICENSE.md) for more details.'
+copyright: '© 2014–2016 [Mapbox](https://www.mapbox.com/). See [license](https://github.com/mapbox/mapbox-gl-native/blob/master/LICENSE.md) for more details.'
custom_head: |
<link rel='shortcut icon' href='http://www.mapbox.com/img/favicon.ico' type='image/x-icon' />
diff --git a/LICENSE.md b/LICENSE.md
index 0afb6d3404..095660f87a 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-mapbox-gl-native copyright (c) 2014-2015, Mapbox.
+mapbox-gl-native copyright (c) 2014-2016 Mapbox.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are
diff --git a/ios/app/app-info.plist b/ios/app/app-info.plist
index 309702d990..87927353b1 100644
--- a/ios/app/app-info.plist
+++ b/ios/app/app-info.plist
@@ -38,7 +38,7 @@
</dict>
</dict>
<key>NSHumanReadableCopyright</key>
- <string>(c) 2014 Mapbox</string>
+ <string>© 2014–2016 Mapbox</string>
<key>NSLocationAlwaysUsageDescription</key>
<string>The map will ALWAYS display the user's location.</string>
<key>NSLocationWhenInUseUsageDescription</key>
diff --git a/ios/benchmark/app-info.plist b/ios/benchmark/app-info.plist
index 61e41c11fd..9d0aad09e1 100644
--- a/ios/benchmark/app-info.plist
+++ b/ios/benchmark/app-info.plist
@@ -25,7 +25,7 @@
<key>LSRequiresIPhoneOS</key>
<true/>
<key>NSHumanReadableCopyright</key>
- <string>(c) 2015 Mapbox</string>
+ <string>© 2015–2016 Mapbox</string>
<key>UIApplicationExitsOnSuspend</key>
<true/>
<key>UILaunchStoryboardName</key>
diff --git a/platform/android/MapboxGLAndroidSDK/build.gradle b/platform/android/MapboxGLAndroidSDK/build.gradle
index ffc1da1172..3fed32766f 100644
--- a/platform/android/MapboxGLAndroidSDK/build.gradle
+++ b/platform/android/MapboxGLAndroidSDK/build.gradle
@@ -87,7 +87,7 @@ android.libraryVariants.all { variant ->
options.windowTitle("Mapbox Android SDK $VERSION_NAME Reference")
options.docTitle("Mapbox Android SDK $VERSION_NAME")
options.header("Mapbox Android SDK $VERSION_NAME Reference")
- options.bottom("&copy; 2015 Mapbox. All rights reserved.")
+ options.bottom("&copy; 2015&ndash;2016 Mapbox. All rights reserved.")
options.links("http://docs.oracle.com/javase/7/docs/api/")
options.linksOffline("http://d.android.com/reference/", "$System.env.ANDROID_HOME/docs/reference")
options.overview("src/main/java/overview.html")
diff --git a/test/ios/LaunchScreen.xib b/test/ios/LaunchScreen.xib
index e0c780d8d4..238fb51b50 100644
--- a/test/ios/LaunchScreen.xib
+++ b/test/ios/LaunchScreen.xib
@@ -12,7 +12,7 @@
<rect key="frame" x="0.0" y="0.0" width="480" height="480"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
- <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2015 Mapbox. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
+ <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="© 2015–2016 Mapbox. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
<rect key="frame" x="20" y="439" width="441" height="21"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>