summaryrefslogtreecommitdiff
path: root/client/Piztor/src/com/macaroon/piztor/Settings.java
diff options
context:
space:
mode:
authorTeddy <ted.sybil@gmail.com>2013-08-26 17:33:55 +0800
committerTeddy <ted.sybil@gmail.com>2013-08-26 17:33:55 +0800
commitcf77f61bff7822b35020f2877ca4e6e683981be1 (patch)
treec7904cda1d81ef8a5dc8b196a7d8e9d360b58d40 /client/Piztor/src/com/macaroon/piztor/Settings.java
parenteb303ea6f1f6aa3e9a0cd4b00ef3fda6b06f0027 (diff)
parent92c5473740f45883c719002d4bc47236c669f51e (diff)
Merge branch 'master' of github.com:Determinant/piztor
Diffstat (limited to 'client/Piztor/src/com/macaroon/piztor/Settings.java')
-rw-r--r--client/Piztor/src/com/macaroon/piztor/Settings.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/client/Piztor/src/com/macaroon/piztor/Settings.java b/client/Piztor/src/com/macaroon/piztor/Settings.java
index 292a112..94c6a94 100644
--- a/client/Piztor/src/com/macaroon/piztor/Settings.java
+++ b/client/Piztor/src/com/macaroon/piztor/Settings.java
@@ -4,7 +4,7 @@ import android.os.Bundle;
import android.app.Activity;
import android.view.Menu;
-public class Settings extends Activity {
+public class Settings extends PiztorAct {
@Override
protected void onCreate(Bundle savedInstanceState) {