projects
/
apps
/
core
/
preloaded
/
smartsearch.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
899e937
560d66a
)
Merge branch 'master' into tizen_2.1
author
Junghyun Kim
<jh1114.kim@samsung.com>
Tue, 23 Apr 2013 05:02:10 +0000
(14:02 +0900)
committer
Junghyun Kim
<jh1114.kim@samsung.com>
Tue, 23 Apr 2013 05:02:10 +0000
(14:02 +0900)
Conflicts:
LICENSE.Flora
Trivial merge