Merge remote-tracking branch 'suprem/sdk_merge' into 'origin/sdk'

Conflicts:
	org.tizen.dynamicanalyzer.workbench.product/resources/config/flatfeature
	org.tizen.dynamicanalyzer/.classpath
	org.tizen.dynamicanalyzer/META-INF/MANIFEST.MF
	org.tizen.dynamicanalyzer/build.properties
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/nl/ConfigureLabels.properties
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/FlatFeature.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/setting/PrimitiveFeature.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/file/FileApiListTable.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/network/NetworkTable.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
	org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/timeline/dlog/DlogTable.java
	package/build.linux
	package/pkginfo.manifest

Change-Id: I6a5f735610aff506cced641eb599febb5999977c

diff --cc org.tizen.dynamicanalyzer.workbench/about.mappings
index fc30645,fc30645..f0f566f
--- 1/org.tizen.dynamicanalyzer.workbench/about.mappings
--- 2/org.tizen.dynamicanalyzer.workbench/about.mappings
+++ b/org.tizen.dynamicanalyzer.workbench/about.mappings
@@@ -1,2 -1,2 +1,2 @@@
--0=2.3.5
--1=20160705-1054
++0=2.3.11
++1=20160822-1849

diff --cc org.tizen.dynamicanalyzer/build.properties
index 23fd095,b8d50af..227dc4b
--- 1/org.tizen.dynamicanalyzer/build.properties
--- 2/org.tizen.dynamicanalyzer/build.properties
+++ b/org.tizen.dynamicanalyzer/build.properties
@@@ -1,14 -1,13 +1,13 @@@
- source.. = src/\r
- output.. = bin/\r
- bin.includes = .,\\r
-                plugin.xml,\\r
-                META-INF/,\\r
-                plugin.properties,\\r
-                build.properties,\\r
-                .settings/,\\r
-                .project,\\r
-                .classpath,\\r
-                lib/,\\r
-                lib/org.eclipse.cdt.debug.edc_1.0.0.201503041838.jar,\\r
-                lib/org.eclipse.draw2d_3.7.2.v20111017-2020.jar\r
- 
+ source.. = src/
+ output.. = bin/
+ bin.includes = .,\
+                plugin.xml,\
+                META-INF/,\
+                plugin.properties,\
+                build.properties,\
+                .settings/,\
+                .project,\
+                .classpath,\
+                lib/,\
+                lib/org.eclipse.cdt.debug.edc_1.0.0.20160816.jar,\
 -               lib/org.eclipse.draw2d_3.10.1.201508170204.jar
++               lib/org.eclipse.draw2d_3.10.1.201508170204.jar

diff --cc org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
index b2e4057,4dfc038..d565609
--- 1/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
--- 2/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
+++ b/org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/thread/ThreadAPIListTable.java
@@@ -527,4 -492,4 +492,4 @@@ public class ThreadAPIListTable extend
                
                return columnName;
        }
--}
++}

diff --cc package/build.linux
index 99359c9,2d61cfc..82980d7
--- 1/package/build.linux
--- 2/package/build.linux
+++ b/package/build.linux
@@@ -49,8 -47,31 +47,31 @@@ __set_parameter(
                        ;;
        esac
  
--    build_result_path="$build_path/$archive_platform_name/$windowing/$architecture/da"
++      build_result_path="$build_path/$archive_platform_name/$windowing/$architecture/da"
        result_archive_file=${build_id}-${archive_platform_name}.${windowing}.${architecture}.zip
+ 
+       reference_ide_path=${ROOTDIR}/eclipse-pde/eclipse
+       reference_ce_path=${ROOTDIR}/ide
+ 
+       if [ "${platform}" = "macos-64" ]; then
+               reference_ide_path=${ROOTDIR}/eclipse-pde/Eclipse.app/Contents/Eclipse
+               reference_ce_path=${ROOTDIR}/TizenStudio.app/Contents/Eclipse
+       elif [ "${archive_platform_name}" = "linux" ]; then
+               reference_ide_path=${ROOTDIR}/eclipse-pde/repository_mars2
+               __unpack_eclipse ${reference_ide_path}
+       fi
+ }
+ 
+ __unpack_eclipse()
+ {
+       for package in ${1}/plugins/*.jar.pack.gz; do
+               if [ -f "${package}" ]; then
+                       jar=${package%.pack.gz}
+                       unpack200 -r "${package}" "${jar}"
+               fi
+       done
+ 
+       cp -rf ${SRCDIR}/p2-deps/configuration ${1}
  }
  
  __set_build_parameter()