Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/CVDisplayLink-scroll-view' (pull…
Browse files Browse the repository at this point in the history
… request github#123)
  • Loading branch information
jspahrsummers committed Oct 19, 2012
2 parents 5f9b5e6 + fc3ffe3 commit 470dffd
Show file tree
Hide file tree
Showing 2 changed files with 267 additions and 256 deletions.
2 changes: 1 addition & 1 deletion lib/UIKit/TUIScrollView.h
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ typedef enum {

__unsafe_unretained id _delegate;

NSTimer *scrollTimer;
CVDisplayLinkRef displayLink;
CGPoint destinationOffset;
CGPoint unfixedContentOffset;

Expand Down
Loading

0 comments on commit 470dffd

Please sign in to comment.