projects / platform / core / uifw / dali-adaptor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 953ac7b 2b67c2e)
Merge "InputMethod Public enums added for settings" into tizen
authorPaul Wisbey <p.wisbey@samsung.com>
Fri, 22 May 2015 16:42:57 +0000 (09:42 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 22 May 2015 16:42:57 +0000 (09:42 -0700)
1  2 
adaptors/public-api/dali.h patch | diff1 | diff2 | blob | history
adaptors/public-api/file.list patch | diff1 | diff2 | blob | history

diff --cc adaptors/public-api/dali.h
index e69f1bc,60a1b57..35d51b6
--- 1/adaptors/public-api/dali.h
--- 2/adaptors/public-api/dali.h
+++ b/adaptors/public-api/dali.h
@@@ -23,9 -23,9 +23,10 @@@
  // Application / UI Framework adaption
  #include <dali/public-api/adaptor-framework/application.h>
  #include <dali/public-api/adaptor-framework/orientation.h>
+ #include <dali/public-api/adaptor-framework/input-method.h>
  #include <dali/public-api/adaptor-framework/key.h>
  #include <dali/public-api/adaptor-framework/timer.h>
 +#include <dali/public-api/adaptor-framework/pixmap-image.h>
  #include <dali/public-api/dali-adaptor-version.h>
  
  #endif //__DALI_H__
diff --cc adaptors/public-api/file.list
Simple merge
Domain: Graphics System / DALi;