On 22/11/14 22:40, Andy Williams wrote: > ajwillia-ms pushed a commit to branch master. > > http://git.enlightenment.org/tools/edi.git/commit/?id=2ad6be9c99dea6b4ee87cc0f3430d379fc255db5 > > commit 2ad6be9c99dea6b4ee87cc0f3430d379fc255db5 > Merge: 5073272 ba42d32 > Author: Andy Williams <[email protected]> > Date: Sat Nov 22 22:40:03 2014 +0000 > > Merge branch 'devs/ajwillia-ms/elm_code' > > elm_code/bin/elm_code_test_main.c | 60 +++--------------- > elm_code/lib/Elm_Code.h | 1 + > elm_code/lib/Makefile.am | 2 + > elm_code/lib/elm_code_diff_widget.c | 122 > ++++++++++++++++++++++++++++++++++++ > elm_code/lib/elm_code_diff_widget.h | 39 ++++++++++++ > elm_code/lib/elm_code_widget.c | 7 ++- > elm_code/lib/elm_code_widget.h | 6 +- > elm_code/tests/testdiff.diff | 10 +++ > src/bin/edi_consolepanel.c | 1 + > src/bin/edi_logpanel.c | 1 + > src/bin/edi_main.c | 14 +++-- > src/bin/mainview/edi_mainview.c | 20 ++++++ > 12 files changed, 222 insertions(+), 61 deletions(-) >
This is not how we do it. :( Please, if you are merging a branch, provide a decent commit message! -- Tom. ------------------------------------------------------------------------------ Download BIRT iHub F-Type - The Free Enterprise-Grade BIRT Server from Actuate! Instantly Supercharge Your Business Reports and Dashboards with Interactivity, Sharing, Native Excel Exports, App Integration & more Get technology previously reserved for billion-dollar corporations, FREE http://pubads.g.doubleclick.net/gampad/clk?id=157005751&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
