• 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
..
BuildHeaders/PodTest Loading commit data...
Headers/PodTest Loading commit data...
Local Podspecs Loading commit data...
PodTest Loading commit data...
Manifest.lock Loading commit data...
Pods-Acknowledgements.markdown Loading commit data...
Pods-Acknowledgements.plist Loading commit data...
Pods-PodTest-acknowledgements.markdown Loading commit data...
Pods-PodTest-acknowledgements.plist Loading commit data...
Pods-PodTest-dummy.m Loading commit data...
Pods-PodTest-environment.h Loading commit data...
Pods-PodTest-prefix.pch Loading commit data...
Pods-PodTest-resources.sh Loading commit data...
Pods-PodTest-subspec_1-acknowledgements.markdown Loading commit data...
Pods-PodTest-subspec_1-acknowledgements.plist Loading commit data...
Pods-PodTest-subspec_1-dummy.m Loading commit data...
Pods-PodTest-subspec_1-environment.h Loading commit data...
Pods-PodTest-subspec_1-prefix.pch Loading commit data...
Pods-PodTest-subspec_1-resources.sh Loading commit data...
Pods-PodTest-subspec_1.xcconfig Loading commit data...
Pods-PodTest-subspec_2-acknowledgements.markdown Loading commit data...
Pods-PodTest-subspec_2-acknowledgements.plist Loading commit data...
Pods-PodTest-subspec_2-dummy.m Loading commit data...
Pods-PodTest-subspec_2-environment.h Loading commit data...
Pods-PodTest-subspec_2-prefix.pch Loading commit data...
Pods-PodTest-subspec_2-resources.sh Loading commit data...
Pods-PodTest-subspec_2.xcconfig Loading commit data...
Pods-PodTest.xcconfig Loading commit data...
Pods-dummy.m Loading commit data...
Pods-environment.h Loading commit data...
Pods-prefix.pch Loading commit data...
Pods-resources.sh Loading commit data...
Pods.xcconfig Loading commit data...
Pods.xcodeproj.yaml Loading commit data...