projects
/
platform
/
framework
/
web
/
crosswalk-tizen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
90a472c
90538d0
)
Merge pull request #266 from dougnukem/patch-2
author
Cheng Zhao
<zcbenz@gmail.com>
Thu, 8 May 2014 04:22:00 +0000
(12:22 +0800)
committer
Cheng Zhao
<zcbenz@gmail.com>
Thu, 8 May 2014 04:22:00 +0000
(12:22 +0800)
Update "app" to "your-app" to avoid module collision with require('app')
Trivial merge