Merge branch 'develop' of gerrithost:/sdk/ide/profiler-eplugin into develop
authoryoonki.park <yoonki.park@samsung.com>
Tue, 26 Jun 2012 04:59:06 +0000 (13:59 +0900)
committeryoonki.park <yoonki.park@samsung.com>
Tue, 26 Jun 2012 04:59:06 +0000 (13:59 +0900)
commitf1aead77bb7eb7d9d8626691f54dc01d97217af7
treeedfed4cf973b6315b836c724b18fe0929c875cd0
parente5640b38eea07c4ce1478702d66e663cca97a967
parent94e04ed1685ad03f607da91d09ef9334c76ee386
Merge branch 'develop' of gerrithost:/sdk/ide/profiler-eplugin into develop

Conflicts:
org.eclipse.linuxtools.oprofile.launch.exe/src/org/tizen/oprofile/launch/TizenOprofileLaunchDelegate.java
org.eclipse.linuxtools.oprofile.launch.exe/src/org/tizen/oprofile/launch/configuration/NormalOprofileLaunchConfigurationTabGroup.java
org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java
org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/ValgrindLaunchConfigurationTabGroup.java
org.eclipse.linuxtools.valgrind.massif/src/org/eclipse/linuxtools/valgrind/massif/MassifLaunchDelegate.java
org.eclipse.linuxtools.valgrind.memcheck/src/org/eclipse/linuxtools/valgrind/memcheck/MemcheckLaunchDelegate.java

Change-Id: Iddba460269c0283fb2523a2050759034ae4d9864
org.eclipse.linuxtools.oprofile.launch.exe/META-INF/MANIFEST.MF
org.eclipse.linuxtools.valgrind.launch.exe/META-INF/MANIFEST.MF
org.eclipse.linuxtools.valgrind.launch.exe/src/org/eclipse/linuxtools/valgrind/launch/TizenValgrindLaunchDelegate.java
org.eclipse.linuxtools.valgrind.massif/META-INF/MANIFEST.MF
org.eclipse.linuxtools.valgrind.memcheck/META-INF/MANIFEST.MF