projects
/
sdk
/
emulator
/
emulator-kernel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
c7d23dd
a216508
)
Merge branch 'develop' into release
author
Kitae Kim
<kt920.kim@samsung.com>
Tue, 23 Oct 2012 12:14:33 +0000
(21:14 +0900)
committer
Kitae Kim
<kt920.kim@samsung.com>
Tue, 23 Oct 2012 12:14:33 +0000
(21:14 +0900)
Conflicts:
drivers/maru/maru_camera.c
package/pkginfo.manifest
Trivial merge
projects / sdk / emulator / emulator-kernel.git / commitdiff