Merge branch 'linux' of git://github.com/dougvj/xenia into linux

# Conflicts: # .travis.yml
2017-12-14 19:20:02 -06:00
parent d896c1f3f0 0406f19f4d
commit 02e37be4e5
45 changed files with 2214 additions and 369 deletions
--- a/src/xenia/ui/menu_item.h
+++ b/src/xenia/ui/menu_item.h
@@ -12,6 +12,7 @@

 #include <functional>
 #include <memory>
+#include <string>
 #include <vector>

 #include "xenia/ui/ui_event.h"