• 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
..
cocoapods-integration-specs @ 47c921f0
fixtures Loading commit data...
functional Loading commit data...
spec_helper Loading commit data...
unit Loading commit data...
integration.rb Loading commit data...
spec_helper.rb Loading commit data...