merge

2017-08-23 21:50:55 +02:00 · 2017-08-23 21:50:55 +02:00 · 0720690c87
commit 0720690c87
parent a0064eae8b 9e67a98482
1 changed files with 6 additions and 0 deletions
--- a/v2.0
+++ b/v2.0
@ -20,11 +20,17 @@ Cleanups:
  [] settingsData -> defaultSettings.py

 General:  
+<<<<<<< HEAD
 - improve attribute handling
+=======
+- imporove attribute handling
+[] improve attributes_curr_char
+>>>>>>> 1.5
 [] add an attribute sound
 [] beep on cursor/ review by char (capital wins)
 [] beep on review by word (once for multiple, capital wins)
 [] configurable (by char, by word, none)
+  https://github.com/jwilk/vcsapeek/blob/master/linuxvt.py

 - Improved Say all
 [] all the text of all pages