ajwillia-ms pushed a commit to branch master.

http://git.enlightenment.org/tools/edi.git/commit/?id=bdc54334daa51aabb750c0ae9c319a8ea9620fc4

commit bdc54334daa51aabb750c0ae9c319a8ea9620fc4
Merge: a9853b2 bfab2aa
Author: Andy Williams <[email protected]>
Date:   Fri May 26 22:07:30 2017 +0100

    Merge branch 'edi-0.5'

 NEWS                               | 16 ++++++++++++++++
 configure.ac                       |  2 +-
 src/bin/editor/edi_editor_search.c |  9 +--------
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --cc NEWS
index 6ff4a6c,8464a2f..e131486
--- a/NEWS
+++ b/NEWS
@@@ -1,10 -1,16 +1,26 @@@
 +=======
 +Edi 0.6
 +=======
 +
 +Features:
 +
 +  * Integrate GDB debugger console
++  * Add snippet support to the code editor
++
++
+ ---------
+ Edi 0.5.1
+ ---------
+ 
+ Features:
+ 
+   * menu: Indicate saved status in menu and toolbar
+   * cmdline: don't try to open unknown file types
+ 
+ Bug fixes:
+ 
+   * Fix issue where replaced text could not be undone
+   * Fix python project detection
  
  
  =======
diff --cc configure.ac
index 38b8392,de1d3e9..039ea12
--- a/configure.ac
+++ b/configure.ac
@@@ -1,4 -1,4 +1,4 @@@
- EFL_VERSION([0], [5], [0])
 -EFL_VERSION([0], [5], [1])
++EFL_VERSION([0], [5], [99])
  AC_INIT([edi], [efl_version], [[email protected]])
  
  AC_PREREQ([2.65])

-- 


Reply via email to