aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFlorian Dold <florian.dold@gmail.com>2014-04-09 14:25:28 +0000
committerFlorian Dold <florian.dold@gmail.com>2014-04-09 14:25:28 +0000
commit3db27442c2e331c6c52408db5004815af519b6dc (patch)
tree9af7b6a2391ac319ec370207817fd284af4f4ea3
parentbf70109eeeb1515ffdf34deb0551700b3b6d203f (diff)
downloadgnunet-java-ext-master.tar.gz
gnunet-java-ext-master.zip
another clashHEADmaster
-rw-r--r--src/main/java/org/gnunet/ext/GreetingBannedMessage.java2
-rw-r--r--src/main/resources/org/gnunet/construct/MsgMap.txt4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/org/gnunet/ext/GreetingBannedMessage.java b/src/main/java/org/gnunet/ext/GreetingBannedMessage.java
index 06a5289..bd7bc0e 100644
--- a/src/main/java/org/gnunet/ext/GreetingBannedMessage.java
+++ b/src/main/java/org/gnunet/ext/GreetingBannedMessage.java
@@ -9,7 +9,7 @@ import org.gnunet.util.GnunetMessage;
9 * 9 *
10 * @author Florian Dold 10 * @author Florian Dold
11 */ 11 */
12@UnionCase(42003) 12@UnionCase(43003)
13public class GreetingBannedMessage implements GnunetMessage.Body { 13public class GreetingBannedMessage implements GnunetMessage.Body {
14 @ZeroTerminatedString 14 @ZeroTerminatedString
15 public String banText; 15 public String banText;
diff --git a/src/main/resources/org/gnunet/construct/MsgMap.txt b/src/main/resources/org/gnunet/construct/MsgMap.txt
index 3c7b423..78b99ef 100644
--- a/src/main/resources/org/gnunet/construct/MsgMap.txt
+++ b/src/main/resources/org/gnunet/construct/MsgMap.txt
@@ -1,4 +1,4 @@
1org.gnunet.util.GnunetMessage$Body|43002=org.gnunet.ext.GreetingResponseMessage 1org.gnunet.util.GnunetMessage$Body|43002=org.gnunet.ext.GreetingResponseMessage
2org.gnunet.util.GnunetMessage$Body|42003=org.gnunet.ext.GreetingBannedMessage
3org.gnunet.util.GnunetMessage$Body|43001=org.gnunet.ext.GreetingRequestMessage 2org.gnunet.util.GnunetMessage$Body|43001=org.gnunet.ext.GreetingRequestMessage
4# generated 2014/04/09 16:23:55 3org.gnunet.util.GnunetMessage$Body|43003=org.gnunet.ext.GreetingBannedMessage
4# generated 2014/04/09 16:25:22