ajwillia-ms pushed a commit to branch master. http://git.enlightenment.org/tools/edi.git/commit/?id=782efd79ca0f6d55889a70fd73c0e8ed46acc905
commit 782efd79ca0f6d55889a70fd73c0e8ed46acc905 Merge: 8572b15 cb87278 Author: Andy Williams <a...@andywilliams.me> Date: Sat Feb 7 16:09:32 2015 +0000 Merge remote-tracking branch 'github/master' src/bin/edi_config.c | 48 +++++++++++++++++++++++++++++++++++++++++ src/bin/edi_config.h | 11 ++++++++++ src/bin/edi_content_provider.c | 9 ++++++-- src/bin/mainview/edi_mainview.c | 3 +++ 4 files changed, 69 insertions(+), 2 deletions(-) --