merged with master

2019-02-12 16:19:51 -08:00
parent 0cb3cd5faf d4365a389c
commit cf92e58ea8
4 changed files with 6767 additions and 2 deletions
@@ -2,4 +2,4 @@
 Makefile
 .qmake.stash
 effects/frei0r
-
+ts/*.qm
@@ -257,7 +257,9 @@ TRANSLATIONS += \
    ts/olive_it.ts \
    ts/olive_cs.ts \
    ts/olive_ar.ts \
-    ts/olive_ru.ts
+    ts/olive_ru.ts \
    ts/olive_bs.ts \
    ts/olive_sr.ts
 win32 {
    RC_FILE = packaging/windows/resources.rc