Merge branch 'tizen' into mw 53/39253/1 mw
authorseokgil.kang <seokgil.kang@samsung.com>
Tue, 12 May 2015 07:48:20 +0000 (16:48 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Tue, 12 May 2015 07:48:20 +0000 (16:48 +0900)
commitdaca7af6af1737995bad9fd785b54736a6d59310
tree82274a66f1d6fb8232ff8e9706ee3ccbbd819a17
parent1851760864120b5ca753c29f444df2124d5c74c1
parent92333c8bd772aadb6f72dfd94ed3410690b98d45
Merge branch 'tizen' into mw

Conflicts:
package/changelog
package/pkginfo.manifest

Change-Id: I7849c92f844148dad70f8415ceba1cf81008384a
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
org.eclipse.linuxtools.profiling.launch/src/org/eclipse/linuxtools/profiling/launch/ProfileLaunchShortcut.java