1. 13 Feb, 2013 1 commit
    • Fabio Pelosin's avatar
      Merge branch 'master' into 0.17 · 955121e6
      Fabio Pelosin authored
      * master:
        [Specs] Fix for master repo changes
        Never consider aggregate targets for integration. Fixes #729 & 784.
        Let’s get Travis to build again.
        Updated downloader spec to check for unflattened zipfiles
        Do not flatten the zip files downloaded via http
      
      Conflicts:
      	lib/cocoapods/downloader/http.rb
      	lib/cocoapods/installer/user_project_integrator.rb
      	spec/functional/downloader_spec.rb
      	spec/unit/installer/user_project_integrator_spec.rb
      	spec/unit/resolver_spec.rb
      	spec/unit/source_spec.rb
      955121e6
  2. 12 Feb, 2013 1 commit
  3. 10 Feb, 2013 1 commit
  4. 08 Feb, 2013 3 commits
  5. 07 Feb, 2013 4 commits
  6. 06 Feb, 2013 1 commit
  7. 05 Feb, 2013 20 commits
  8. 03 Feb, 2013 9 commits