fix conflicted files - toolbar, scroller
[framework/uifw/elementary.git] / data / objects / multibuttonentry.edc
2012-02-15 Jaehwan KimEFL migration revision 67547
2012-02-14 Jaehwan KimEFL migration revision 67547
2011-11-24 mike_melementary: Add multibuttonentry widget