Merge branch 'tizen' into mw 71/28671/1
authorseokgil.kang <seokgil.kang@samsung.com>
Tue, 14 Oct 2014 01:55:42 +0000 (10:55 +0900)
committerseokgil.kang <seokgil.kang@samsung.com>
Tue, 14 Oct 2014 01:55:42 +0000 (10:55 +0900)
commitc299f0721c5dbe78cb4ee84247a6fb9cae26d163
tree31ab19d981d0667d2ce17439966a4ccb1d064422
parent3af64c7bfc1ab88f8f96f15fb2c673f0eb7bdec2
parent33c4e47755ef3b95e5f3339eac5d89c1e595606c
Merge branch 'tizen' into mw

Conflicts:
org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java
package/changelog

Change-Id: I53e94b583593f5cf93d24897cd1b0594f522e6cc
Signed-off-by: seokgil.kang <seokgil.kang@samsung.com>
package/changelog
package/pkginfo.manifest