merge conflict fix...

Signed-off-by: Alex A. Naanou <alex.nanou@gmail.com>
This commit is contained in:
Alex A. Naanou 2013-02-03 06:08:15 +04:00
commit 643ca33b97

View File

@ -5,7 +5,9 @@
| touchdown point.
[_] BUG: no drag threshold on excludedElements (TouchSwipe)
| stalled...
[_] 74% general todo
[_] 75% general todo
[_] Try using scroll instead of left of .magazine....
| this might improve speed...
[_] BUG: as on android before, on loading from json view does not reach cur page...
| likely due to animation/transition stopping for some reason....
[_] 0% add two main page themes (global/local applicable):