diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /libs/minidns/src/main/java/de/measite/minidns/record/PTR.java | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'libs/minidns/src/main/java/de/measite/minidns/record/PTR.java')
| -rw-r--r-- | libs/minidns/src/main/java/de/measite/minidns/record/PTR.java | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/libs/minidns/src/main/java/de/measite/minidns/record/PTR.java b/libs/minidns/src/main/java/de/measite/minidns/record/PTR.java deleted file mode 100644 index 6e200655..00000000 --- a/libs/minidns/src/main/java/de/measite/minidns/record/PTR.java +++ /dev/null @@ -1,19 +0,0 @@ -package de.measite.minidns.record; - -import java.io.DataInputStream; -import java.io.IOException; - -import de.measite.minidns.Record.TYPE; -import de.measite.minidns.util.NameUtil; - -/** - * A PTR record is handled like a CNAME - */ -public class PTR extends CNAME { - - @Override - public TYPE getType() { - return TYPE.PTR; - } - -} |