Merge branch 'beta' into mergemaster

# Conflicts: # src/main.cpp
2018-04-16 10:16:01 +03:00
parent 9226f69ef1
commit e73b2055c6
910 changed files with 112009 additions and 11364 deletions
--- a/src/fiat/oot
+++ b/src/fiat/oot
@@ -0,0 +1,2 @@
+#!/bin/bash
+./komodo-cli -ac_name=OOT $1 $2 $3 $4 $5 $6