Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: kylemcdonald/ofxZxing
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: cran-io/ofxZxing
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 18 commits
  • 146 files changed
  • 3 contributors

Commits on Jul 2, 2015

  1. Update readme

    @nventuro
    nventuro committed Jul 2, 2015
    Copy the full SHA
    3a9220e View commit details

  2. Rename readme to readme.md

    @nventuro
    nventuro committed Jul 2, 2015
    Copy the full SHA
    2502ebd View commit details

  3. Adapted ofxZxing to use the new version of ZXing.

    Nicolás Venturo committed Jul 2, 2015
    Copy the full SHA
    867642c View commit details

  4. Updated ZXing header files.

    Nicolás Venturo committed Jul 2, 2015
    Copy the full SHA
    afc7ceb View commit details

  5. Removed OSX and iOS files.

    Nicolás Venturo committed Jul 2, 2015
    Copy the full SHA
    4976067 View commit details

  6. Fixed port of ofxZxing files.

    Nicolás Venturo committed Jul 2, 2015
    Copy the full SHA
    90c0575 View commit details

  7. Added makefile configuration and libs for linux.

    Nicolás Venturo committed Jul 2, 2015
    Copy the full SHA
    626e7d7 View commit details

  8. Update readme.md

    @nventuro
    nventuro committed Jul 2, 2015
    Copy the full SHA
    c714a5c View commit details

Commits on Jul 3, 2015

  1. Added armv6 support.

    Nicolás Venturo committed Jul 3, 2015
    Copy the full SHA
    4f59012 View commit details

  2. Merge remote-tracking branch 'origin/master'

    Nicolás Venturo committed Jul 3, 2015
    Copy the full SHA
    4a186a7 View commit details

Commits on Jun 25, 2016

  1. Rearranged folders for projectGenerator to work. Added last version (… 

    …zxing-cpp github) ofxZxing headers.
    Javier Velazquez Traut committed Jun 25, 2016
    Copy the full SHA
    31c8d45 View commit details

  2. Added Windows Visual Studio 11 (2012) compiled library

    Javier Velazquez Traut committed Jun 25, 2016
    Copy the full SHA
    d94168a View commit details

  3. Added an example back in

    Javier Velazquez Traut committed Jun 25, 2016
    Copy the full SHA
    172c66a View commit details

  4. Default value for adaptive

    Javier Velazquez Traut committed Jun 25, 2016
    Copy the full SHA
    78be097 View commit details

  5. Corrected config file

    Javier Velazquez Traut committed Jun 25, 2016
    Copy the full SHA
    7c93888 View commit details

  6. Added gitignore

    Javier Velazquez Traut committed Jun 25, 2016
    Copy the full SHA
    2c937ef View commit details

Commits on Jul 23, 2016

  1. Modified addon_config

    Javier Velazquez Traut committed Jul 23, 2016
    Copy the full SHA
    180adf2 View commit details

Commits on Jul 24, 2016

  1. Corrected addon_config. Making it work with OF_IMAGE_ALPHA

    Javier Velazquez Traut committed Jul 24, 2016
    Copy the full SHA
    2e1784a View commit details
Loading