Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/patch' into next
Browse files Browse the repository at this point in the history
  • Loading branch information
hcrowell committed Jan 26, 2017
2 parents d1c4ffc + 16ad401 commit 3aa85ae
Show file tree
Hide file tree
Showing 450 changed files with 455 additions and 476 deletions.
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
4 changes: 2 additions & 2 deletions AirshipKit/AirshipConfig.xcconfig
@@ -1,5 +1,5 @@
//
// Copyright 2009-2016 Urban Airship Inc. All rights reserved.
// Copyright 2009-2017 Urban Airship 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:
Expand All @@ -22,7 +22,7 @@
// OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
// ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
//
CURRENT_PROJECT_VERSION = 8.1.5
CURRENT_PROJECT_VERSION = 8.1.6

// Uncomment to include the preview build warning
// OTHER_CFLAGS = $(inherited) -DUA_PREVIEW=1
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSJSONSerialization+UAAdditions.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSJSONSerialization+UAAdditions.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSManagedContext+UAAdditions.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSManagedObjectContext+UAAdditions.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSOperationQueue+UAAdditions.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSOperationQueue+UAAdditions.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSString+UALocalizationAdditions.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSString+UALocalizationAdditions.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSString+UAURLEncoding.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/NSString+UAURLEncoding.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAPIClient+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAPIClient.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAPNSRegistration+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAPNSRegistration.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAccountEventTemplate.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAccountEventTemplate.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAction+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAction+Operators.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAction+Operators.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAction.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAAction.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionArguments+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionArguments.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionArguments.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionJSDelegate.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionJSDelegate.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRegistry+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRegistry.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRegistry.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRegistryEntry+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRegistryEntry.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRegistryEntry.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionResult+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionResult.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionResult.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRunner+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRunner.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionRunner.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionSchedule+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionSchedule.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionSchedule.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionScheduleData+Internal.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionScheduleData.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionScheduleInfo.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActionScheduleInfo.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActivityViewController.h
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down
2 changes: 1 addition & 1 deletion AirshipKit/AirshipKit/UAActivityViewController.m
@@ -1,5 +1,5 @@
/*
Copyright 2009-2016 Urban Airship Inc. All rights reserved.
Copyright 2009-2017 Urban Airship 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:
Expand Down

0 comments on commit 3aa85ae

Please sign in to comment.