projects / sdk / emulator / event-injector.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 27cf1fe 19e0529)
Merge branch 'develop' into tizen_2.1
authorjihye kim <jihye1128.kim@samsung.com>
Tue, 11 Jun 2013 08:02:36 +0000 (17:02 +0900)
committerjihye kim <jihye1128.kim@samsung.com>
Tue, 11 Jun 2013 08:02:36 +0000 (17:02 +0900)
commitb96b8aaf21acc33aadfd13bb64913c0c0087aa88
tree7ce4da8202907580f52264de000c94ebc7cfb8e8tree | snapshot
parent27cf1fe7a91d9e89069befe63fdcde83a00918b9commit | diff
parent19e052982ab9767194493b9ec98d6420fa66ac81commit | diff
Merge branch 'develop' into tizen_2.1

Conflicts:
ei-library/src/org/tizen/eilib/connection/EmulatorList.java
package/changelog
package/pkginfo.manifest

Change-Id: I278bfb7e09fb5ced2aa31bdf15994e82abb2b73d
Signed-off-by: jihye kim <jihye1128.kim@samsung.com>
Domain: SDK / Emulator;