提交: 89bd5f08cd8f99dbb2457f817d82ed871301c21d - CDEvents (git)

An Objective-C wrapper for Mac OS X’s FSEvents C API.

Commit MetaInfo

• 修订版: 89bd5f08cd8f99dbb2457f817d82ed871301c21d (tree)
• 时间: 2013-07-03 05:17:26
• 作者: Aron Cedercrantz <aron@cede...>
• Commiter: Aron Cedercrantz

Log Message

Merge branch 'release/1.2.1' into develop

* release/1.2.1:

Update podspec to 1.2.1.
Change framework version to 1.2.1.
Bump copyright year.

更改概述

• modified: CDEvent.h
• modified: CDEvent.m
• modified: CDEvents.h
• modified: CDEvents.m
• modified: CDEvents.podspec
• modified: CDEventsDelegate.h
• modified: Info.plist
• modified: TestApp/CDEventsTestAppController.h
• modified: TestApp/CDEventsTestAppController.m
• modified: TestApp/main.m
• modified: compat.h

差异

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010-2012 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/CDEvent.m
+++ b/CDEvent.m
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010-2012 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/CDEvents.h
+++ b/CDEvents.h
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010-2012 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/CDEvents.m
+++ b/CDEvents.m
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010-2012 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/CDEvents.podspec
+++ b/CDEvents.podspec
@@ -1,11 +1,11 @@
 Pod::Spec.new do |s|
   s.name         = "CDEvents"
-  s.version      = "1.2.0"
+  s.version      = "1.2.1"
   s.summary      = "An Objective-C wrapper for Mac OS X’s FSEvents C API."
   s.homepage     = "http://rastersize.github.com/CDEvents"
   s.license      = 'MIT'
   s.author       = { "Aron Cedercrantz" => "[e-mail]" }
-  s.source       = { :git => "https://github.com/rastersize/CDEvents.git", :tag => "1.2.0" }
+  s.source       = { :git => "https://github.com/rastersize/CDEvents.git", :tag => "1.2.1" }
   s.platform     = :osx, '10.6'
   s.source_files = '*.{h,m}'
   s.framework    = 'CoreServices'

--- a/CDEventsDelegate.h
+++ b/CDEventsDelegate.h
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010-2012 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/Info.plist
+++ b/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1.2.0</string>
+	<string>1.2.1</string>
 	<key>NSPrincipalClass</key>
 	<string></string>
 </dict>

--- a/TestApp/CDEventsTestAppController.h
+++ b/TestApp/CDEventsTestAppController.h
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/TestApp/CDEventsTestAppController.m
+++ b/TestApp/CDEventsTestAppController.m
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/TestApp/main.m
+++ b/TestApp/main.m
@@ -1,7 +1,7 @@
 /**
  * CDEvents
  *
- * Copyright (c) 2010 Aron Cedercrantz
+ * Copyright (c) 2010-2013 Aron Cedercrantz
  * http://github.com/rastersize/CDEvents/
  *
  * Permission is hereby granted, free of charge, to any person

--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,32 @@
 /**
+ * CDEvents
+ *
+ * Copyright (c) 2010-2013 Aron Cedercrantz
+ * http://github.com/rastersize/CDEvents/
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/**
  * @headerfile compat.h
  * FSEventStream flag compatibility shim
  *