Peter M. Groen / dali-demo

Commit a347a8419a26fd7b3af5bdd5d22d41eb90f6a7e5

Authored by Victor Cebollada
2 parents bad2f1bf 918bdcfc

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

Change-Id: I42eae2ea4d71dd52c77b2d7729a712f54ab0ed26
Inline Side-by-side
Showing 5 changed files with 16 additions and 15 deletions
examples/image-scaling-irregular-grid/grid-flags.h
  View file @a347a84
1 -#ifndef __DALI_DEMO_GRID_FLAGS_H_  
2 -#define __DALI_DEMO_GRID_FLAGS_H_ 1 +#ifndef DALI_DEMO_GRID_FLAGS_H
  2 +#define DALI_DEMO_GRID_FLAGS_H
3 /* 3 /*
4 * Copyright (c) 2014 Samsung Electronics Co., Ltd. 4 * Copyright (c) 2014 Samsung Electronics Co., Ltd.
5 * 5 *
@@ -197,7 +197,8 @@ private: @@ -197,7 +197,8 @@ private:
197 unsigned mHighestUsedRow; 197 unsigned mHighestUsedRow;
198 }; 198 };
199 199
200 -} /* namespace Demo */  
201 -} /* namespace Dali */ 200 +} // namespace Demo
202 201
203 -#endif /* __DALI_DEMO_GRID_FLAGS_H_ */ 202 +} // namespace Dali
  203 +
  204 +#endif // DALI_DEMO_GRID_FLAGS_H
examples/text-label-emojis/emoji-strings.h
  View file @a347a84
1 -#ifndef __DALI_DEMO_EMOJI_STRINGS_H__  
2 -#define __DALI_DEMO_EMOJI_STRINGS_H__ 1 +#ifndef DALI_DEMO_EMOJI_STRINGS_H
  2 +#define DALI_DEMO_EMOJI_STRINGS_H
3 3
4 /* 4 /*
5 * Copyright (c) 2015 Samsung Electronics Co., Ltd. 5 * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -100,4 +100,4 @@ namespace EmojiStrings @@ -100,4 +100,4 @@ namespace EmojiStrings
100 100
101 } // EmojiStrings 101 } // EmojiStrings
102 102
103 -#endif // __DALI_DEMO_EMOJI_STRINGS_H__ 103 +#endif // DALI_DEMO_EMOJI_STRINGS_H
packaging/com.samsung.dali-demo.spec
  View file @a347a84
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.4.20 5 +Version: 1.4.21
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0
shared/multi-language-strings.h
  View file @a347a84
1 -#ifndef __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__  
2 -#define __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__ 1 +#ifndef DALI_DEMO_MULTI_LANGUAGE_STRINGS_H
  2 +#define DALI_DEMO_MULTI_LANGUAGE_STRINGS_H
3 3
4 /* 4 /*
5 * Copyright (c) 2015 Samsung Electronics Co., Ltd. 5 * Copyright (c) 2015 Samsung Electronics Co., Ltd.
@@ -227,4 +227,4 @@ namespace MultiLanguageStrings @@ -227,4 +227,4 @@ namespace MultiLanguageStrings
227 227
228 } // MultiLanguageStrings 228 } // MultiLanguageStrings
229 229
230 -#endif // __DALI_DEMO_MULTI_LANGUAGE_STRINGS_H__ 230 +#endif // DALI_DEMO_MULTI_LANGUAGE_STRINGS_H
shared/view.h
  View file @a347a84
1 -#ifndef __DALI_DEMO_HELPER_VIEW_H__  
2 -#define __DALI_DEMO_HELPER_VIEW_H__ 1 +#ifndef DALI_DEMO_HELPER_VIEW_H
  2 +#define DALI_DEMO_HELPER_VIEW_H
3 3
4 /* 4 /*
5 * Copyright (c) 2014 Samsung Electronics Co., Ltd. 5 * Copyright (c) 2014 Samsung Electronics Co., Ltd.
@@ -177,4 +177,4 @@ Dali::Toolkit::TextLabel CreateToolBarLabel( const std::string& text ) @@ -177,4 +177,4 @@ Dali::Toolkit::TextLabel CreateToolBarLabel( const std::string& text )
177 177
178 } // DemoHelper 178 } // DemoHelper
179 179
180 -#endif // __DALI_DEMO_HELPER_VIEW_H__ 180 +#endif // DALI_DEMO_HELPER_VIEW_H