aboutsummaryrefslogtreecommitdiffstats
path: root/src/eu/siacs/conversations/Config.java
diff options
context:
space:
mode:
authoriNPUTmice <daniel@gultsch.de>2014-08-31 18:21:46 +0200
committeriNPUTmice <daniel@gultsch.de>2014-08-31 18:21:46 +0200
commitbda7724e317dd46f831df29c4c920b3913c533cb (patch)
treee5c072207e2c6850a3becd1de8657365ec7eb4b5 /src/eu/siacs/conversations/Config.java
parent28fa48704d4084617d7e32e4a10f785c4b996163 (diff)
improvements for merge conditions
Diffstat (limited to '')
-rw-r--r--src/eu/siacs/conversations/Config.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/eu/siacs/conversations/Config.java b/src/eu/siacs/conversations/Config.java
index 4d90b919..04c8af3d 100644
--- a/src/eu/siacs/conversations/Config.java
+++ b/src/eu/siacs/conversations/Config.java
@@ -14,6 +14,8 @@ public final class Config {
public static final int AVATAR_SIZE = 192;
public static final Bitmap.CompressFormat AVATAR_FORMAT = Bitmap.CompressFormat.WEBP;
+
+ public static final int MESSAGE_MERGE_WINDOW = 20;
private Config() {