Update integration specs, add CHANGELOG

5264fcdb · Muhammed Yavuz Nuzumlali · e58be841 · 5264fcdb · 5264fcdb · 565dd11d
Commit 5264fcdb authored Nov 29, 2015 by Muhammed Yavuz Nuzumlali
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

CHANGELOG.md CHANGELOG.md +4 -0

Gemfile.lock Gemfile.lock +1 -1

cocoapods-integration-specs spec/cocoapods-integration-specs +1 -1

No files found.
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -91,6 +91,10 @@ To install release candidates run `[sudo] gem install cocoapods --pre`

 ##### Bug Fixes

+* Fix compiling of asset catalog files inside resource bundles.  
+  [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)
+  [#4501](https://github.com/CocoaPods/CocoaPods/issues/4501)
+
 * Prevent installer to be run from inside sandbox directory.  
  [Muhammed Yavuz Nuzumlalı](https://github.com/manuyavuz)


--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,7 +24,7 @@ GIT

 GIT
  remote: https://github.com/CocoaPods/Xcodeproj.git
-  revision: f7d31a59aa080c24fd50cbb66b50ee30ddf52a50
+  revision: ad8f6b78e424c274b63ff42ff6ad72840cb307a6
  branch: master
  specs:
    xcodeproj (0.28.2)

--- a/cocoapods-integration-specs @ 565dd11d
+++ b/cocoapods-integration-specs @ 565dd11d
-Subproject commit a98b63248bd1286f0ecebcb08df6c75a3015bc3b
+Subproject commit 565dd11d9ad810cf7665f1c5830eb5a1305c7e45