• Fabio Pelosin's avatar
    Merge branch 'master' into pods-project-edit-feature · 93b38c13
    Fabio Pelosin authored
    * master:
      [Project] Define CocoaPods build settings explicitely
      [Source] Don't load the specs in #search
      [Installer] Recreate and hide user schemes.
      [Xcodeproj] Adapt for interface change.
      [Gemfile] Use coveralls from rubygems
      [CHANGELOG] More tweaking related to Xcode 5 migration.
      [CHANGELOG] Try to reword notes related to Xcode 5.
      Depend on version 3.2 or greater of activesupport
      [Core] Add documentation_url DSL attribute to specification
      [Xcconfig] Reference vendored libraries & frameworks with a relative path
      [Fixtures] Sort the Pods project by name
      [Xcodeproj] Sort the Pods project by name
      [Bundle] udpate
      Remove stray debug puts
      New sentence works better here in the default podspec documentation.
      Fixed a typo on the word 'include' in the default podspec documentation.
    
    Conflicts:
    	lib/cocoapods/installer.rb
    	lib/cocoapods/installer/user_project_integrator/target_integrator.rb
    	lib/cocoapods/project.rb
    	spec/cocoapods-integration-specs
    	spec/unit/installer/user_project_integrator/target_integrator_spec.rb
    	spec/unit/project_spec.rb
    93b38c13
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...
Gemfile.lock Loading commit data...
LICENSE Loading commit data...
README.md Loading commit data...
Rakefile Loading commit data...
cocoapods.gemspec Loading commit data...