Simon Lees 31db183cee Fixed another mistery conflict ... OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=23		2014-12-31 00:45:22 +00:00
.gitattributes	OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=14	2014-02-24 10:00:53 +00:00
.gitignore	OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=14	2014-02-24 10:00:53 +00:00
AUTHORS	OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=14	2014-02-24 10:00:53 +00:00
COPYING	OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=14	2014-02-24 10:00:53 +00:00
def-ibar.txt	OBS-URL: https://build.opensuse.org/package/show/X11:Enlightenment:Factory/enlightenment-branding-openSUSE?expand=0&rev=20	2014-09-26 23:28:47 +00:00
enlightenment-branding-openSUSE.changes	Fixed another mistery conflict	2014-12-31 00:45:22 +00:00
enlightenment-branding-openSUSE.spec	Fixed another mistery conflict	2014-12-31 00:45:22 +00:00