actionslider test application merging conflicts are resolved.
[framework/uifw/elementary.git] / data / desktop /
drwxr-xr-x   ..
-rw-r--r-- 272 Makefile.am
-rw-r--r-- 7313 elementary.png
-rw-r--r-- 474 elementary_config.desktop
-rw-r--r-- 480 elementary_test.desktop