• R/O
  • HTTP
  • SSH
  • HTTPS

Commit

Tags
No Tags

Frequently used words (click to add to your profile)

javac++androidlinuxc#windowsobjective-ccocoa誰得qtpythonphprubygameguibathyscaphec計画中(planning stage)翻訳omegatframeworktwitterdomtestvb.netdirectxゲームエンジンbtronarduinopreviewer

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


Commit MetaInfo

Revision89bd5f08cd8f99dbb2457f817d82ed871301c21d (tree)
Time2013-07-03 05:17:26
AuthorAron Cedercrantz <aron@cede...>
CommiterAron 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.

Change Summary

Incremental Difference

--- a/CDEvent.h
+++ b/CDEvent.h
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010-2012 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/CDEvent.m
+++ b/CDEvent.m
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010-2012 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/CDEvents.h
+++ b/CDEvents.h
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010-2012 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/CDEvents.m
+++ b/CDEvents.m
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010-2012 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/CDEvents.podspec
+++ b/CDEvents.podspec
@@ -1,11 +1,11 @@
11 Pod::Spec.new do |s|
22 s.name = "CDEvents"
3- s.version = "1.2.0"
3+ s.version = "1.2.1"
44 s.summary = "An Objective-C wrapper for Mac OS X’s FSEvents C API."
55 s.homepage = "http://rastersize.github.com/CDEvents"
66 s.license = 'MIT'
77 s.author = { "Aron Cedercrantz" => "aron@cedercrantz.se" }
8- s.source = { :git => "https://github.com/rastersize/CDEvents.git", :tag => "1.2.0" }
8+ s.source = { :git => "https://github.com/rastersize/CDEvents.git", :tag => "1.2.1" }
99 s.platform = :osx, '10.6'
1010 s.source_files = '*.{h,m}'
1111 s.framework = 'CoreServices'
--- a/CDEventsDelegate.h
+++ b/CDEventsDelegate.h
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010-2012 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/Info.plist
+++ b/Info.plist
@@ -17,11 +17,11 @@
1717 <key>CFBundlePackageType</key>
1818 <string>FMWK</string>
1919 <key>CFBundleShortVersionString</key>
20- <string>1.2.0</string>
20+ <string>1.2.1</string>
2121 <key>CFBundleSignature</key>
2222 <string>????</string>
2323 <key>CFBundleVersion</key>
24- <string>1.2.0</string>
24+ <string>1.2.1</string>
2525 <key>NSPrincipalClass</key>
2626 <string></string>
2727 </dict>
--- a/TestApp/CDEventsTestAppController.h
+++ b/TestApp/CDEventsTestAppController.h
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/TestApp/CDEventsTestAppController.m
+++ b/TestApp/CDEventsTestAppController.m
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/TestApp/main.m
+++ b/TestApp/main.m
@@ -1,7 +1,7 @@
11 /**
22 * CDEvents
33 *
4- * Copyright (c) 2010 Aron Cedercrantz
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
55 * http://github.com/rastersize/CDEvents/
66 *
77 * Permission is hereby granted, free of charge, to any person
--- a/compat.h
+++ b/compat.h
@@ -1,4 +1,32 @@
11 /**
2+ * CDEvents
3+ *
4+ * Copyright (c) 2010-2013 Aron Cedercrantz
5+ * http://github.com/rastersize/CDEvents/
6+ *
7+ * Permission is hereby granted, free of charge, to any person
8+ * obtaining a copy of this software and associated documentation
9+ * files (the "Software"), to deal in the Software without
10+ * restriction, including without limitation the rights to use,
11+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
12+ * copies of the Software, and to permit persons to whom the
13+ * Software is furnished to do so, subject to the following
14+ * conditions:
15+ *
16+ * The above copyright notice and this permission notice shall be
17+ * included in all copies or substantial portions of the Software.
18+ *
19+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
20+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
21+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
22+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
23+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
24+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
25+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
26+ * OTHER DEALINGS IN THE SOFTWARE.
27+ */
28+
29+/**
230 * @headerfile compat.h
331 * FSEventStream flag compatibility shim
432 *