Commit Graph

2 Commits

Author SHA1 Message Date
Kai Huuhko bd88b8845e Merge branch 'master' into elmfusion
Conflicts:
	efl/elementary/__init__.pyx
	efl/elementary/colorselector.pxi
	efl/elementary/multibuttonentry.pxi
	efl/elementary/need.pxi
2015-04-24 15:59:11 +03:00
Kai Huuhko d3569bf1f1 Elm: Unify modules into a monolithic module 2015-04-18 04:45:11 +03:00