projects / sdk / tools / dynamic-analyzer.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a150777 9d8ad1b)
Merge remote-tracking branch 'origin/tizen' into da-opengl 56/26656/1
authorHyunjong.park <phjwithyou.park@samsung.com>
Wed, 27 Aug 2014 08:33:49 +0000 (17:33 +0900)
committerHyunjong.park <phjwithyou.park@samsung.com>
Wed, 27 Aug 2014 08:33:49 +0000 (17:33 +0900)
commitca4a8a3471b0307ab620d106983716ea665a913e
tree44d068e9d93182695eee956e05983dc374a1195ftree | snapshot
parenta1507772efcfd04bdcc942e77dce68b2e447eaa8commit | diff
parent9d8ad1b8162bd7bb81e5034b17ab800596bb23dbcommit | diff
Merge remote-tracking branch 'origin/tizen' into da-opengl

Conflicts:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/DBConstants.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/database/SqlConnectionManager.java
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStateDataMaker.java

Change-Id: I35de3846bda0e17b7c133416cc200bdad0814ba8
Signed-off-by: Hyunjong.park <phjwithyou.park@samsung.com>
12 files changed:
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/AnalyzerManager.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/common/DALimit.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/info/callstack/CallstackTable.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/GLExtractUniformDataMaker.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/DB/GLCommonStateDBTableManager.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLCommonStateDataMaker.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLContextSharingDataMaker.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLStatisticsDataManager.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/GLTextureStateDataMaker.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/data/type/GLRedundantDataType.java diff1 | | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/opengl/table/state/GLContextTable.java diff1 | diff2 | blob | history
org.tizen.dynamicanalyzer/src/org/tizen/dynamicanalyzer/ui/widgets/table/DATableComposite.java diff1 | diff2 | blob | history
Domain: SDK / Dynamic Analysis;