projects / sdk / emulator / eventinjector-eplugin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 912dcfc 1f504af)
Merge branch 'private-develop' into develop
authorsungmin ha <sungmin82.ha@samsung.com>
Fri, 10 Aug 2012 10:24:22 +0000 (19:24 +0900)
committersungmin ha <sungmin82.ha@samsung.com>
Fri, 10 Aug 2012 10:24:22 +0000 (19:24 +0900)
Conflicts:
org.tizen.device/src/org/tizen/device/sdcard/page/SdcardPage.java
org.tizen.location.map/src/org/tizen/location/map/page/MapImage.java
org.tizen.telephony.call/src/org/tizen/telephony/call/page/MOMTCall.java
package/build.linux
package/pkginfo.manifest


Trivial merge
Domain: SDK / Emulator;