[dali_1.3.7] Merge branch 'devel/master'

Change-Id: If2e39ca722506c8ac30a82180e73a6e6479415a2

diff --git a/build/scripts/dali_env b/build/scripts/dali_env
index 2381f4a..05c9fc3 100755 (executable)
--- a/build/scripts/dali_env
+++ b/build/scripts/dali_env
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 
-# Copyright (c) 2017 Samsung Electronics Co., Ltd.
+# Copyright (c) 2018 Samsung Electronics Co., Ltd.
 
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -49,6 +49,7 @@ my @system_packages = (
     "lcov",
     "libcurl4-gnutls-dev",
     "curl",
+    "libssl-dev",
 );
 
 # Some packages like require building from source

diff --git a/dali/public-api/dali-core-version.cpp b/dali/public-api/dali-core-version.cpp
index d544f13..693d053 100644 (file)
--- a/dali/public-api/dali-core-version.cpp
+++ b/dali/public-api/dali-core-version.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int CORE_MAJOR_VERSION = 1;
 const unsigned int CORE_MINOR_VERSION = 3;
-const unsigned int CORE_MICRO_VERSION = 6;
+const unsigned int CORE_MICRO_VERSION = 7;
 const char * const CORE_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 7f83566..81b6a98 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,6 +1,6 @@
 Name:       dali
 Summary:    DALi 3D Engine
-Version:    1.3.6
+Version:    1.3.7
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT