We can merge it. ------------------------------------ -Regards, Hermet-
-----Original Message----- From: "Daniel Juyung Seo"<seojuyu...@gmail.com> To: "Enlightenment developer list"<enlightenment-devel@lists.sourceforge.net>; Cc: <enlightenment-...@lists.sourceforge.net>; Sent: 2013-07-16 (화) 20:52:25 Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: edje/vim - updated syntax I have no idea which one is the right one. But at least more people have been modified/touched data/edc.vim. Danie Juyung Seo (SeoZ) On Tue, Jul 16, 2013 at 8:05 PM, ChunEon Park <hermet>@naver.com> wrote: > well... > seems one should be removed. > how about removing efl/data/edje/edc.vim? > > ------------------------------------ > -Regards, Hermet- > > -----Original Message----- > From: "Daniel Juyung Seo"<seojuyung2>@gmail.com> > To: "enlightenment-devel"<enlightenment-devel>@lists.sourceforge.net>; > Cc: <enlightenment-git>@lists.sourceforge.net>; > Sent: 2013-07-16 (화) 13:32:02 > Subject: Re: [E-devel] [EGIT] [core/efl] master 01/01: edje/vim - updated > syntax > > Oh it looks like there are two edc.vim files in git. > efl/data/edje/edc.vim vs efl/data/edje/vim/syntax/edc.vim. > What's the difference? > > Daniel Juyung Seo (SeoZ) > > > On Mon, Jul 15, 2013 at 10:16 PM, ChunEon Park - Enlightenment Git < > no-re...@enlightenment.org> wrote: > > > hermet pushed a commit to branch master. > > > > commit 17f18500a73901b44d7ffc7511b886f78e9ff9ed > > Author: ChunEon Park <hermet>@hermet.pe.kr> > > Date: Mon Jul 15 22:16:08 2013 +0900 > > > > edje/vim - updated syntax > > --- > > data/edje/vim/syntax/edc.vim 1 + > > 1 file changed, 1 insertion(+) > > > > diff --git a/data/edje/vim/syntax/edc.vim b/data/edje/vim/syntax/edc.vim > > index 6f41ae3..2a9b7e8 100644 > > --- a/data/edje/vim/syntax/edc.vim > > +++ b/data/edje/vim/syntax/edc.vim > > @@ -47,6 +47,7 @@ syn keyword edcLabel int double string > external > > script_only contained > > > > syn keyword edcConstant COMP RAW LOSSY NONE ON_HOLD AUTOGRAB > NOGRAB > > syn keyword edcConstant TEXT IMAGE RECT TEXTBLOCK SWALLOW > GRADIENT > > GROUP > > +syn keyword edcConstant SPACER > > syn keyword edcConstant NONE PLAIN OUTLINE SOFT_OUTLINE SHADOW > > PROXY > > syn keyword edcConstant SOFT_SHADOW OUTLINE_SHADOW > > OUTLINE_SOFT_SHADOW > > syn keyword edcConstant GLOW FAR_SHADOW FAR_SOFT_SHADOW > > > > -- > > > > > > > ------------------------------------------------------------------------------ > > See everything from the browser to the database with AppDynamics > > Get end-to-end visibility with application monitoring from AppDynamics > > Isolate bottlenecks and diagnose root cause in seconds. > > Start your free trial of AppDynamics Pro today! > > > http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk > > > > ------------------------------------------------------------------------------ > See everything from the browser to the database with AppDynamics > Get end-to-end visibility with application monitoring from AppDynamics > Isolate bottlenecks and diagnose root cause in seconds. > Start your free trial of AppDynamics Pro today! > http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > > > ------------------------------------------------------------------------------ > See everything from the browser to the database with AppDynamics > Get end-to-end visibility with application monitoring from AppDynamics > Isolate bottlenecks and diagnose root cause in seconds. > Start your free trial of AppDynamics Pro today! > http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk > _______________________________________________ > enlightenment-devel mailing list > enlightenment-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/enlightenment-devel > ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel ------------------------------------------------------------------------------ See everything from the browser to the database with AppDynamics Get end-to-end visibility with application monitoring from AppDynamics Isolate bottlenecks and diagnose root cause in seconds. Start your free trial of AppDynamics Pro today! http://pubads.g.doubleclick.net/gampad/clk?id=48808831&iu=/4140/ostg.clktrk _______________________________________________ enlightenment-devel mailing list enlightenment-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
