diff options
Diffstat (limited to 'NEWS')
-rw-r--r-- | NEWS | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -1,3 +1,5 @@ +<<<<<<< HEAD:NEWS +======= 83 * added new user-interface features @@ -35,6 +37,7 @@ * minor updates to Spanish translations +>>>>>>> f1d5ed75c29961a718eb3c59fde1663c184f20cf:NEWS 81 * fixed keyboard input bug introduced in v79 |