• Fabio Pelosin's avatar
    Merge branch 'master' into list-new · 8390a901
    Fabio Pelosin authored
    * master:
      Added note about set_arc_compatibility_flag to the CHANGELOG
      Looks like the -fobj-arc flag we added to OTHER_LD_FLAGS in ea918cd9 was an unsupported feature as it has now been removed from Xcode 4.3.2, causing lib tool to complain about an unrecognised flag.
      Instead of removing the VCR cache, namespace the cache by Ruby version.
      Remove Guard dependencies. Use `rake spec:kick` for auto-test-running.
      Make sure to use bundler for rake tasks that run bacon.
      Oops, use correct rake task.
      Move travis install commands to Rakefile and setup CFLAGS env for Travis/RVM.
      Hmm, chicken and egg problem on Travis, copy travis:setup task from Xcodeproj.
      Replace Xcodeproj git submodule by adding it to the Gemfile. Closes #172.
      Improve error report template. Closes #187.
    
    Conflicts:
    	.kick
    8390a901
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...
CHANGELOG.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...
TODO Loading commit data...
cocoapods.gemspec Loading commit data...
scratch-pad.md Loading commit data...