• Fabio Pelosin's avatar
    Merge branch 'master' into dedicated-targets · b9dfaa9d
    Fabio Pelosin authored
    * master: (34 commits)
      [SpecHelper] Use coveralls head which fixes issues with colored
      [Integration] Update fixtures for Generator::CopyResourcesScript
      [Generator::CopyResourcesScript] Clean-up
      Update CHANGELOG.md
      Update CHANGELOG
      [Gemspec] Include sandbox-pod
      [SanboxBin] Include /usr/libexec
      [Sandbox] Reading from paths that contain executables should be safe.
      [Sandbox] Remove doc generation related rules and allow for more prefixes. (E.g. MacPorts.)
      [Search] Show all command options.
      [Travis] No need to install Mercurial anymore 2
      [Travis] No need to install Mercurial anymore
      [Complete] Fix copy resources script for iOS < 6 and OS X < 10.8
      added issue link to the fix
      updated changelog for inhibit_warnings fix
      [Changelog]
      [Specs] Refine output
      [Specs] Facelift inspired to xctool
      [Changelog]
      [Integration] Use aggressive cache
      ...
    
    Conflicts:
    	lib/cocoapods/installer/target_installer.rb
    	spec/integration/install_external_source/after/Pods/Pods-resources.sh
    	spec/integration/install_local_source/after/Pods/Pods-resources.sh
    b9dfaa9d
Name
Last commit
Last update
bin Loading commit data...
examples Loading commit data...
lib Loading commit data...
spec Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
.kick Loading commit data...
.travis.yml Loading commit data...
.yardopts Loading commit data...
CHANGELOG.md Loading commit data...
CONTRIBUTING.md Loading commit data...
Gemfile Loading commit data...
LICENSE Loading commit data...
README.md Loading commit data...
Rakefile Loading commit data...
cocoapods.gemspec Loading commit data...