Merge branch 'master' of git.cardforge.org:core-developers/forge into agetian-master

This commit is contained in:
Agetian
2018-12-09 12:52:29 +03:00
16 changed files with 278 additions and 82 deletions

View File

@@ -13,6 +13,10 @@ import org.robovm.apple.foundation.NSAutoreleasePool;
import org.robovm.apple.uikit.UIApplication;
import org.robovm.apple.uikit.UIPasteboard;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
public class Main extends IOSApplication.Delegate {
@Override
@@ -94,5 +98,10 @@ public class Main extends IOSApplication.Delegate {
public void exit() {
// Not possible on iOS
}
@Override
public void convertToJPEG(InputStream input, OutputStream output) throws IOException {
}
}
}