Merge branch 'tizen' into mw and update package version 20/29720/1
authorJuYoung Kim <j0.kim@samsung.com>
Mon, 3 Nov 2014 08:14:04 +0000 (17:14 +0900)
committerJuYoung Kim <j0.kim@samsung.com>
Mon, 3 Nov 2014 08:14:04 +0000 (17:14 +0900)
commitf14930a50fc589b801415d5c0957ea2f813994e2
treecf54d4caf9bd678108fb501ceb5d627016bbb725
parent8dc3571c18b80a79607ebe2b06a2a34d28802297
parenta4d6b38f4195deae44f74de7dc24134bbb799ee9
Merge branch 'tizen' into mw and update package version

Signed-off-by: JuYoung Kim <j0.kim@samsung.com>
Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java

Change-Id: I7ae79c5e1427f76eed4ef53f454db38205f74a83
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/communicator/DACommunicator.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/swap/logparser/MessageParser.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/toolbar/setting/SettingDialog.java
package/changelog
package/pkginfo.manifest