moonlight-stream/moonlight-android
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-android.git synced 2026-04-04 15:06:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolve merge conflicts

Browse Source
This commit is contained in:
Ansa89
2014-11-12 09:41:12 +01:00
parent d317c5bf03 9d72314b9c
commit 88f139873c
26 changed files with 750 additions and 389 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/com/limelight/Game.java
View File

@@ -678,8 +678,8 @@ public class Game extends Activity implements SurfaceHolder.Callback,
e.printStackTrace();
stopConnection();
Dialog.displayDialog(this, getResources().getString(R.string.conn_fail_title),
getResources().getString(R.string.conn_fail_msg), true);
Dialog.displayDialog(this, getResources().getString(R.string.conn_terminated_title),
getResources().getString(R.string.conn_terminated_msg), true);
}
}