Merge branch 'tizen' into mw

Conflicts:
	package/changelog
	package/pkginfo.manifest

Change-Id: I8affc55f4eae3ce5bf6a17da2e767f495e97f8a6
Signed-off-by: jungwook.ryu <jungwook.ryu@samsung.com>

diff --cc package/changelog
index dffb672,f942327..5c32a72
--- 1/package/changelog
--- 2/package/changelog
+++ b/package/changelog
@@@ -1,10 -1,12 +1,19 @@@
++* 2.1.49
++- Bug fix - open trace file (revision parsing logic)
++== Jungwook Ryu <jungwook.ryu@samsung.com> 2014-09-04
 +* 2.1.48
 +- bug fix for memory overflow check logic and DaLimit's variable
 +- apply other enhancements
 +== Seokgil Kang <seokgil.kang@samsung.com> 2014-08-29
  * 2.1.47
- - modify build dependency
- == Jungwook Ryu <jungwook.ryu@samsung.com> 2014-08-22
+ - modify build dependency for kepler build
+ - modify Summary layout of the warning detail view
+ - Revision heap chart for library allocation
+ - Platform Support: support Windows, Mac OS
+ - add mechanism to save the data that cannot be inserted to database at runtime
+ - database tuning
+ - fix some bugs
+ == Jungwook Ryu <jungwook.ryu@samsung.com> 2014-08-29
  * 2.1.46
  - bug fix. Dynamic Analyzer window will be hang while go through "About Tizen Dynamic Analyzer"icon
  == Hyunjong Park <phjwithyou.park@samsung.com> 2014-08-14

diff --cc package/pkginfo.manifest
index 7cc1bdf,2a3e080..4cab2da
--- 1/package/pkginfo.manifest
--- 2/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@@ -1,5 -1,5 +1,5 @@@
  Source:dynamic-analyzer
- Version:2.1.48
 -Version:2.1.47
++Version:2.1.49
  Maintainer:Jaewon Lim <jaewon81.lim@samsung.com>, Juyoung Kim <j0.kim@samsung.com>
  
  Package:dynamic-analyzer-product