This repository has been archived by the owner on Sep 9, 2020. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 62
Collect useful commits from other forks and package it in a pull request. #11
Open
schmidp
wants to merge
18
commits into
netshade:master
Choose a base branch
from
openresearch:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Conflicts: CocoaTouchBarcodes.xcodeproj/project.pbxproj
1) Add CocoaTouchBarcodes as a Target Membership. 2) Link libCocoaTouchBarcodes.a in your project. 3) #import <CocoaTouchBarcodes/NKDBarcodeFramework.h>
@@ -23,7 +23,6 @@ TODO: | |||
* Better documentation | |||
* Really, the entire API pretty much needs a refactor. The UIImage category as entry point into generating images as a start, NKDBarcodeOffscreenView doesn't really need to subclass UIView, etc.. | |||
* Leak checks | |||
* ARC compatibility? I guess? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
lol
Lot of good changes in here, I'll check out the branch this week and try it out - great idea to pull all these together, thanks. |
Closed
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Hi,
I went through a few forks that have reasonable commits which are useful for everyone and merged them in my fork.
This pull request should merge changes of the following repos:
https://github.com/baldmountain/Cocoa-Touch-Barcodes/ by @baldmountain
https://github.com/baz/Cocoa-Touch-Barcodes/ by @baz
https://github.com/netshade/Cocoa-Touch-Barcodes/
https://github.com/openresearch/Cocoa-Touch-Barcodes/
Tell me what you think about it.