Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Swift 2.0 #15

Merged
merged 10 commits into from Oct 5, 2015
Merged

Swift 2.0 #15

merged 10 commits into from Oct 5, 2015

Commits on Jun 19, 2015

  1. Update to Swift 2.0

    yageek committed Jun 19, 2015
    Configuration menu
    Copy the full SHA
    63c1d54 View commit details
    Browse the repository at this point in the history

Commits on Aug 25, 2015

  1. Update to swift on XCode 7 Beta 6

    Emily Toop committed Aug 25, 2015
    Configuration menu
    Copy the full SHA
    d213648 View commit details
    Browse the repository at this point in the history

Commits on Aug 26, 2015

  1. Merge pull request #1 from mozilla/master

    Update to Swift 2.0 on XCode 7 Beta 6
    yageek committed Aug 26, 2015
    Configuration menu
    Copy the full SHA
    8feddb4 View commit details
    Browse the repository at this point in the history

Commits on Aug 27, 2015

  1. carthage update

    norio-nomura committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    e89a82a View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    819820e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f3f3dc5 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    b32bd0f View commit details
    Browse the repository at this point in the history
  5. Merge commit '8feddb46e8b82abfcbb6f3ac606bd1fcde3669ca' into swift-2

    * commit '8feddb46e8b82abfcbb6f3ac606bd1fcde3669ca':
      Update to swift on XCode 7 Beta 6
      Update to Swift 2.0
    
    # Conflicts:
    #	Base32.xcodeproj/project.pbxproj
    #	Base32.xcodeproj/project.xcworkspace/xcshareddata/Base32.xcscmblueprint
    #	Base32/Base16.swift
    #	Base32/Base32.swift
    #	Base32Tests/Base32Tests.swift
    
    close #11
    norio-nomura committed Aug 27, 2015
    Configuration menu
    Copy the full SHA
    d1a2380 View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2015

  1. Merge branch 'master' into swift-2

    * master:
      Add GITHUB_ACCESS_TOKEN to .travis.yml
    norio-nomura committed Aug 28, 2015
    Configuration menu
    Copy the full SHA
    fbe2619 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2015

  1. Add *.xcscmblueprint to .gitignore

    [ci skip]
    norio-nomura committed Aug 31, 2015
    Configuration menu
    Copy the full SHA
    4e4ccee View commit details
    Browse the repository at this point in the history