[Fix:Conflict]Changed the animation of a default defined from none to fade. 61/3961/2 2.0alpha-wayland
authorNakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
Fri, 14 Jun 2013 01:36:21 +0000 (10:36 +0900)
committerNakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
Fri, 14 Jun 2013 01:39:04 +0000 (10:39 +0900)
commita734dfb193f61d7235fdd50e5e12b816dd1f26dd
treed6b411ddbc66bbd92a2f4a35eb1926e9cb936892
parente0bc60d3c6728821f39d97f3ec4824372b6a310d
[Fix:Conflict]Changed the animation of a default defined from none to fade.

Change-Id: I30923a6a8a274b98253a41209833249d69b93667
Signed-off-by: Nakamura Hayato <hayato.nakamura@mail.toyota-td.jp>
packaging/ico-uxf-weston-plugin.changes
packaging/ico-uxf-weston-plugin.spec
src/config-parser.c
src/ico_ivi_shell.c
src/ico_window_animation.c
tests/weston_ivi_plugin.ini
weston_ivi_plugin.ini