Merge branch 'tizen' into devel'

Change-Id: I97cd85f371a3dddd8a0401c9554780a49aa481fa

diff --cc maps-plugin-here.changes
index 5fcc2c7432a62a96bc1bac303d14ceb597ae25a5,55b2a8dd2b9d5d00a52b32e7c42936439936d0c6..1ba2b8dc7f5c8e42676e978e0df473327f2ef6eb
--- 1/maps-plugin-here.changes
--- 2/maps-plugin-here.changes
+++ b/maps-plugin-here.changes
@@@ -1,6 -1,16 +1,20 @@@
- [Version]   maps-plugin-here_0.3.3
++[Version]   maps-plugin-here_0.4.0
 +[Date]      28 July 2016
 +[Title]     Support to set departure time for routing
++
+ [Version]   maps-plugin-here_0.3.5
+ [Date]      31 Aug 2016
+ [Title]     fixed bugs that media-data of place-image or place-review can be omitted
+ [Developer] Seechan Kim <cbible.kim@samsung.com>
+ 
+ [Version]   maps-plugin-here_0.3.4
+ [Date]      24 Aug 2016
+ [Title]     modified to flush gl buffer after rendering
+ [Developer] Seechan Kim <cbible.kim@samsung.com>
+ 
+ [Version]   maps-plugin-here_0.3.3
+ [Date]      03 Aug 2016
+ [Title]     Fixed some problems related with path data of routing
  [Developer] Seechan Kim <cbible.kim@samsung.com>
  
  [Version]   maps-plugin-here_0.3.2

diff --cc packaging/maps-plugin-here.spec
index a8d67f4383b4751f3499604bdc5c334a84096c88,0e2b767dabb82c8005e48589a0ab9ec32c95f497..0052ac45193d5d68f7fa748e0f77d45c80d58a17
--- 1/packaging/maps-plugin-here.spec
--- 2/packaging/maps-plugin-here.spec
+++ b/packaging/maps-plugin-here.spec
@@@ -1,6 -1,6 +1,6 @@@
  Name:       maps-plugin-here
  Summary:    Tizen HERE Maps Plug-in Library
- Version:    0.3.3
 -Version:    0.3.5
++Version:    0.4.0
  Release:    1
  Group:      Location/Libraries
  License:    Apache-2.0 and HERE

diff --cc src/here_route.cpp
Simple merge