Commit 741614684efcc9abc662ac292e043b1b0723d29e

Authored by greynaga
2 parents 5ebdb7e9 c4732337

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

Change-Id: I1a8ef9edfe5f52ab18018bfd9786b50de57c211e
examples/pre-render-callback/pre-render-callback-example.cpp
1 1 /*
2   - * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  2 + * Copyright (c) 2019 Samsung Electronics Co., Ltd.
3 3 *
4 4 * Licensed under the Apache License, Version 2.0 (the "License");
5 5 * you may not use this file except in compliance with the License.
... ... @@ -15,7 +15,7 @@
15 15 */
16 16  
17 17 #include <dali-toolkit/dali-toolkit.h>
18   -#include <dali/integration-api/adaptors/adaptor.h>
  18 +#include <dali/integration-api/adaptor-framework/adaptor.h>
19 19 #include <dali/devel-api/adaptor-framework/application-devel.h>
20 20 #include <dali-toolkit/devel-api/controls/control-devel.h>
21 21  
... ...
packaging/com.samsung.dali-demo.spec
... ... @@ -2,7 +2,7 @@
2 2  
3 3 Name: com.samsung.dali-demo
4 4 Summary: The OpenGLES Canvas Core Demo
5   -Version: 1.4.43
  5 +Version: 1.4.44
6 6 Release: 1
7 7 Group: System/Libraries
8 8 License: Apache-2.0
... ...