Skip to content

Commit 576b2d8

Browse files
committed
Merge branch 'master' into swift3
2 parents 3e50c53 + df52a70 commit 576b2d8

File tree

3 files changed

+9
-1
lines changed

3 files changed

+9
-1
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ It contains no major changes in the library itself, however it does change some
66

77
- Updated for Swift 3 and Xcode 8 compatibility #28 @ldiqual
88

9+
### 1.4.1 (2016-08-03)
10+
11+
- Add support for Xcode 8 (Swift 2.3) for Carthage users
12+
913
### 1.4.0 (2016-04-10)
1014

1115
- Add a variant of `every` and `new(every:)` that takes a closure with `NSTimer` passed in

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2015 Radosław Pietruszewski
3+
Copyright (c) 2015-2016 Radosław Pietruszewski
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

README.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,10 @@ Timer.every(5.seconds) { (timer: Timer) in
7878

7979
## Installation
8080

81+
**For Swift 3 compatibility, check out [the `swift3` branch](https://github.com/radex/SwiftyTimer/tree/swift3)**
82+
83+
#### CocoaPods
84+
8185
If you're using CocoaPods, just add this line to your Podfile:
8286

8387
```ruby

0 commit comments

Comments
 (0)