projects / sdk / emulator / emulator-manager.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 533a23d a11bbbe)
Merge branch 'release-0.21' into develop
authorsyeon.hwang <syeon.hwang@samsung.com>
Sat, 17 Mar 2012 15:14:34 +0000 (00:14 +0900)
committersyeon.hwang <syeon.hwang@samsung.com>
Sat, 17 Mar 2012 15:14:34 +0000 (00:14 +0900)
Conflicts:
src/org/tizen/emulator/manager/tool/FileIO.java
src/org/tizen/emulator/manager/tool/Launcher.java


Trivial merge
Domain: SDK / Emulator;