Dev Master Merge - Githubissues

xuijs / xui

A tiny javascript framework for mobile web apps.

http://xuijs.com

788 stars 106 forks source link

Closed mwbrooks closed 13 years ago

mwbrooks commented 13 years ago

Hey guys,

I closed off pull request #8 and pushed the merge onto a separate branch.

I tried to cross-reference each conflict, to ensure that proper commits are added. Please test this out before pulling it in.

Michael

filmaj commented 13 years ago

Merged and tested - tests pass, looking good.