projects
/
sdk
/
emulator
/
emulator-manager.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a4a93ba
8762af6
)
Merge branch 'release' into develop
author
jihye kim
<jihye1128.kim@samsung.com>
Fri, 24 Aug 2012 02:48:22 +0000
(11:48 +0900)
committer
jihye kim
<jihye1128.kim@samsung.com>
Fri, 24 Aug 2012 02:48:22 +0000
(11:48 +0900)
Conflicts:
package/pkginfo.manifest
Trivial merge