From 4306e9c7f2205cf75c1a4cce30390f3fa3d360de Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 8 Jun 2016 15:58:56 -0400 Subject: [PATCH 1/3] [FontDiskLoader] Removed extra /x03 character in comment because it shouldn't be there. Reviewers: O1 Material components iOS! Tags: #material_components_ios Differential Revision: http://codereview.cc/D951 --- components/FontDiskLoader/src/MDCFontDiskLoader.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/FontDiskLoader/src/MDCFontDiskLoader.h b/components/FontDiskLoader/src/MDCFontDiskLoader.h index 7b179f87c25..98e41961705 100644 --- a/components/FontDiskLoader/src/MDCFontDiskLoader.h +++ b/components/FontDiskLoader/src/MDCFontDiskLoader.h @@ -104,7 +104,7 @@ /** A convience method for getting a font. */ - (nullable UIFont *)fontOfSize:(CGFloat)fontSize; -// TODO: On or after 6/8/2016 delete these deprecations +// TODO: On or after 6/8/2016 delete these deprecations - (void)setIsRegistered:(BOOL)isRegistered __deprecated_msg("This setter is no longer public"); - (void)setHasFailedRegistration:(BOOL)hasFailedRegistration __deprecated_msg("This setter is no longer public"); From 4d541ac8a431de82c0e62d3bfca08ee55588557c Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 8 Jun 2016 17:06:24 -0400 Subject: [PATCH 2/3] Cut hot fix --- CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index fec197d0c59..95d831fcbb8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,5 @@ +# 10.1.1 + # 10.1.0 ## API diffs From e445cd7b0a54b875b9c0aed59f6496b964ede519 Mon Sep 17 00:00:00 2001 From: randallli Date: Wed, 8 Jun 2016 17:17:48 -0400 Subject: [PATCH 3/3] Added commit changes to CHANGELOG.md. --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 95d831fcbb8..89c5ebdd530 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # 10.1.1 +### FontDiskLoader + +#### Changes + +* [Removed extra /x03 character in comment because it shouldn't be there.](https://github.com/google/material-components-ios/commit/b018eb87438ccfd4fa99850d9ed48698ff91e7e3) (randallli) + # 10.1.0 ## API diffs