Merge branch 'develop'

skywinder · Apr 17, 2015 · bd8325b · bd8325b
2 parents aa3a0c7 + bdf0f97
commit bd8325b
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,15 +1,27 @@
 # Change Log
 
-## [Unreleased](https://github.com/skywinder/ActionSheetPicker-3.0/tree/HEAD)
+## [1.6.1](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.6.1) (2015-04-17)
 
-[Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.5.1...HEAD)
+[Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.6.0...1.6.1)
 
-**Closed issues:**
+**Implemented enhancements:**
 
-- iOS 7.1 done button requires long press [\#167](https://github.com/skywinder/ActionSheetPicker-3.0/issues/167)
+- Carthage support [\#171](https://github.com/skywinder/ActionSheetPicker-3.0/issues/171)
+
+## [1.6.0](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.6.0) (2015-04-17)
+
+[Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.5.1...1.6.0)
+
+**Implemented enhancements:**
+
+- Integration ActionSheetPicker as dynamic framework [\#170](https://github.com/skywinder/ActionSheetPicker-3.0/issues/170)
+
+- Cancel Action unknow for `ActionSheetDistancePicker` [\#166](https://github.com/skywinder/ActionSheetPicker-3.0/issues/166)
 
 **Merged pull requests:**
 
+- iOS 5.1.1 compatibility added [\#164](https://github.com/skywinder/ActionSheetPicker-3.0/pull/164) ([kashifhisam](https://github.com/kashifhisam))
+
 - Added "tag" to AbstractActionSheet [\#159](https://github.com/skywinder/ActionSheetPicker-3.0/pull/159) ([Jeepston](https://github.com/Jeepston))
 
 ## [1.5.1](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.5.1) (2015-03-27)
@@ -20,6 +32,10 @@
 
 - iOS 8 - iPad - UISplitViewController issue. [\#157](https://github.com/skywinder/ActionSheetPicker-3.0/issues/157)
 
+**Closed issues:**
+
+- iOS 7.1 done button requires long press [\#167](https://github.com/skywinder/ActionSheetPicker-3.0/issues/167)
+
 ## [1.5.0](https://github.com/skywinder/ActionSheetPicker-3.0/tree/1.5.0) (2015-03-05)
 
 [Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.4.0...1.5.0)
@@ -36,6 +52,10 @@
 
 [Full Changelog](https://github.com/skywinder/ActionSheetPicker-3.0/compare/1.3.13...1.4.0)
 
+**Implemented enhancements:**
+
+- ActionSheetDistancePicker + Swift usage [\#139](https://github.com/skywinder/ActionSheetPicker-3.0/issues/139)
+
 **Merged pull requests:**
 
 - Add additional showPickerWithTitle method [\#143](https://github.com/skywinder/ActionSheetPicker-3.0/pull/143) ([martinpfannemueller](https://github.com/martinpfannemueller))

diff --git a/README.md b/README.md
@@ -1,10 +1,9 @@
-[![Build Status](https://travis-ci.org/skywinder/ActionSheetPicker-3.0.svg?branch=master)](https://travis-ci.org/skywinder/ActionSheetPicker-3.0)
 [![Version](http://img.shields.io/cocoapods/v/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0)
 [![Carthage compatible](https://img.shields.io/badge/Carthage-compatible-4BC51D.svg?style=flat)](https://github.com/Carthage/Carthage)
-
+[![Build Status](https://travis-ci.org/skywinder/ActionSheetPicker-3.0.svg?branch=master)](https://travis-ci.org/skywinder/ActionSheetPicker-3.0)
+[![Issues](http://img.shields.io/github/issues/skywinder/ActionSheetPicker-3.0.svg)](https://github.com/skywinder/ActionSheetPicker-3.0/issues?state=open)
 [![License](https://img.shields.io/cocoapods/l/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0)
 [![Platform](https://img.shields.io/cocoapods/p/ActionSheetPicker-3.0.svg)](http://cocoadocs.org/docsets/ActionSheetPicker-3.0)
-[![Issues](http://img.shields.io/github/issues/skywinder/ActionSheetPicker-3.0.svg)](https://github.com/skywinder/ActionSheetPicker-3.0/issues?state=open)
 
 ActionSheetPicker-3.0
 ==================
@@ -23,7 +22,7 @@ ActionSheetPicker-3.0
 
 Please welcome: **ActionSheetPicker-3.0**!
 
-`pod 'ActionSheetPicker-3.0', '~> 1.6.1'` (**iOS 5.1.1-8.x** compatible!)
+`pod 'ActionSheetPicker-3.0', '~> 1.5.1'` (**iOS 5.1.1-8.x** compatible!)
 
 Improvements more than welcome - they are kindly requested :)