1. 23 Nov, 2012 3 commits
    • Fabio Pelosin's avatar
      Merge branch 'master' into core-extraction · 908790f5
      Fabio Pelosin authored
      * master: (29 commits)
        Release 0.16.0
        [RakeFile] More fixes for release task.
        [Gemspec] Require xcodeproj 0.4.0.
        [RakeFile] Minor fix for release task.
        [FileList] User rake 1.9.4.
        Release 0.16.0.rc5
        [Travis] Need to wait a bit longer for standard Ruby 2 support.
        [Travis] Maybe I should use the alias?
        [Travis] Ruby 2.0.0 preview 1, yo!
        [Integrator] Properly detect if the lib has been integrated.
        [Lockfile] An inline podspec should always be considered needing installation.
        [CHANGELOG] Update with inline podspec deprecation.
        [Podfile] Update doc regarding the usage of `:podspec` instead of an inline spec.
        [Podfile] Inline specs are deprecated, use the `:podspec` option.
        Fix typo in podspec comments
        Release 0.16.0.rc4
        [FileList] Fix for Rake 0.9.3
        Fixed typo in spec template
        Release 0.16.0.rc3
        [gemspec] Update Xcodeproj dependency.
        ...
      
      Conflicts:
      	CHANGELOG.md
      	Gemfile.lock
      	cocoapods.gemspec
      	lib/cocoapods.rb
      	lib/cocoapods/installer/user_project_integrator.rb
      	lib/cocoapods/lockfile.rb
      	lib/cocoapods/podfile.rb
      	lib/cocoapods/resolver.rb
      	spec/functional/user_project_integrator_spec.rb
      908790f5
    • Fabio Pelosin's avatar
      Minor fixes. · bec926fa
      Fabio Pelosin authored
      bec926fa
    • Fabio Pelosin's avatar
      [Changelog] · 6d4d8127
      Fabio Pelosin authored
      6d4d8127
  2. 22 Nov, 2012 6 commits
  3. 21 Nov, 2012 13 commits
  4. 17 Nov, 2012 1 commit
  5. 15 Nov, 2012 17 commits