forked from enlightenment/enventor
Conflicts: data/themes/default/images.edc data/themes/default/images/Makefile.am |
||
---|---|---|
.. | ||
.proto | ||
desktop | ||
icon | ||
images | ||
themes | ||
Makefile.am |
Conflicts: data/themes/default/images.edc data/themes/default/images/Makefile.am |
||
---|---|---|
.. | ||
.proto | ||
desktop | ||
icon | ||
images | ||
themes | ||
Makefile.am |