Merge branch 'master' of https://github.com/archer96/app-UI

Browse Source

Conflicts:
	samples/01 - viewnavigator/02 - movie reviews/index.html
	samples/02 - splitviewnavigator/02 - movie reviews/index.html
	samples/03 - slidingView/03 - swipeview/index.html
	samples/03 - slidingView/03 - swipeview/style.css
	samples/03 - slidingView/04 - oridomi/index.html
	samples/03 - slidingView/05 - oridomi w viewnav/index.html
	samples/04 - browser history/index.html
	src/slidingview/slidingview.js
	src/splitviewnavigator/splitviewnavigator.css
	src/viewnavigator/viewnavigator.css
	src/viewnavigator/viewnavigator.js

...

This commit is contained in:

Andrew Trice 2013-02-08 16:30:42 -05:00

parent 8be7936004 ba82104912

commit 06b2928389

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available