Browse code

Update ChangeLog.txt

Cleanup History

lorglas authored onSun/Aug/2020 07:0:th • GitHub committed onSun/Aug/2020 07:0:th
Showing1 changed files
... ...
@@ -4,13 +4,8 @@ Bug fixes
4 4
 - Bug fixes in YabInterfaces (some return Statement added (bbjimmy/lorglas)
5 5
 Reactivating Feature
6 6
 - Columnbox sorting activated
7
-<<<<<<< HEAD
8
-enhancement
9
-- Sound command loop activted
10
-=======
11 7
 Enhancement 
12 8
 - Sound command loop activted, Example: sound play "file.mp3", loop
13
->>>>>>> hotfix_1_7_9
14 9
 - texturl allow to use https
15 10
 - Change Cursor to Haiku Style
16 11