1. 17 May, 2013 4 commits
    • 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
    • Fabio Pelosin's avatar
    • Fabio Pelosin's avatar
      2ce119df
    • Fabio Pelosin's avatar
      [Generator::CopyResourcesScript] Clean-up · 779412f7
      Fabio Pelosin authored
      See #1030
      779412f7
  2. 16 May, 2013 9 commits
  3. 15 May, 2013 3 commits
  4. 10 May, 2013 6 commits
  5. 09 May, 2013 4 commits
  6. 08 May, 2013 5 commits
  7. 07 May, 2013 9 commits