* 'master' of github.com:CocoaPods/CocoaPods:
Fix integration spec, which was trying to assign a source to subspecs.
Fix spec that was using a newer version of lib than expected.
Update spec repo fixture to latest 0.6 and fix CP version checking.
Fix a RubyGems specific version spec failure.
Update SSToolkit fixture submodule.
Fix version number.
Conflicts:
lib/cocoapods/command/repo.rb
* 'master' of github.com:CocoaPods/CocoaPods: (25 commits)
Updated CHANGELOG.md
Added acknowledgements_path to TargetDefinition class
Use String.empty? instead of == ""
Made Acknowledgements Plist title configurable
Fixed Acknowledgements file names
Removed unnecessary () from specs
Improved Markdown Acknowledgements unit testing
Improved Plist Acknowledgements unit testing some more
Improve Acknowledgements unit testing
Improve Plist Acknowledgements unit testing a little
Completed basic implementation of Markdown Acknowledgements subclass
WIP: Added Markdown Acknowledgements subclass
Added Plist Acknowledgements sub-class
Changed Local_pod license method to license_text and added fallback to file if no text specified
Cleaned up BananaLib fixture a little
Simplify Acknowledgement file saving
Correct a few typos
Minor changes to Acknowledgements header and footer text
Integrate acknowledgements generator into install command
Speculative fix for possible bug when a pod has no licence
...
One of the tests wasn't restoring the changes it made to the config.
As the test was difficult to track down and the problem would have
become only worse in the future, the issues was solved starting with
a new config before each run.
The performance impact seems negligible and the testing environment is
more predictable.
* master:
Minor copy change
A few small fixes related to integrating multiple targets/projects.
Add rake ~> 0.9.0 (for rake/file_list.rb file) to gemspec. Closes#195.
Fix for https://github.com/CocoaPods/CocoaPods/issues/141
[Push] Bypass pre-commit hook.
[Fix] GitHub downloader was downloading the repos twice.
Conflicts:
spec/unit/resolver_spec.rb
