switch-to-experimental.diff
changeset 90 bed5beae28c5
parent 88 0a87df8ad9c1
child 92 66f7e2aa040c
--- a/switch-to-experimental.diff	Sat Nov 07 17:49:58 2015 +0200
+++ b/switch-to-experimental.diff	Fri Mar 04 14:17:38 2016 +0200
@@ -1,10 +1,10 @@
 # HG changeset patch
-# Parent  b47f104be890171410d9eae72a90508a162cb836
+# Parent  3f04914d86436042efad7477cf6be0ab67cfcc8d
 [local] Switch to experimental branch and api version
 
-diff -r b47f104be890 mcabber/ChangeLog.api
---- a/mcabber/ChangeLog.api	Sat Nov 07 14:22:58 2015 +0200
-+++ b/mcabber/ChangeLog.api	Sat Nov 07 14:55:06 2015 +0200
+diff -r 3f04914d8643 mcabber/ChangeLog.api
+--- a/mcabber/ChangeLog.api	Sat Feb 27 13:53:01 2016 +0100
++++ b/mcabber/ChangeLog.api	Fri Mar 04 13:54:06 2016 +0200
 @@ -1,3 +1,12 @@
 +experimental (45)
 +
@@ -17,8 +17,8 @@
 +
  dev (41)
  
-  * Change prototype of otr_send()
-@@ -36,6 +45,15 @@
+  * Stable api 1.0.2:1
+@@ -38,6 +47,15 @@
  
    -- Mikael Berthe, 2015-10-04
  
@@ -34,7 +34,7 @@
  dev (36)
  
   * Change prototype of gpg_encrypt()
-@@ -118,6 +136,15 @@
+@@ -120,6 +138,15 @@
  
    -- Mikael Berthe, 2013-09-29
  
@@ -50,7 +50,7 @@
  dev (26)
  
   * Changeset 69699ba3010f
-@@ -127,6 +154,15 @@
+@@ -129,6 +156,15 @@
  
    -- Mikael Berthe, 2013-04-28
  
@@ -66,7 +66,7 @@
  dev (25)
  
   * Stable api 0.10.2:1
-@@ -135,6 +171,15 @@
+@@ -137,6 +173,15 @@
  
    -- Mikael Berthe, 2012-11-28
  
@@ -82,7 +82,7 @@
  dev (24)
  
   * Changeset 0cb8ea02e472
-@@ -144,6 +189,15 @@
+@@ -146,6 +191,15 @@
  
    -- Myhailo Danylenko, 2012-10-20
  
@@ -98,7 +98,7 @@
  dev (23)
  
   * Changeset 8dc418af3e72
-@@ -165,6 +219,12 @@
+@@ -167,6 +221,12 @@
  
    -- Hermitifier, 2011-10-03
  
@@ -111,10 +111,10 @@
  dev (20)
  
   * Add cmd_set_safe() and cmd_is_safe()
-diff -r b47f104be890 mcabber/configure.ac
---- a/mcabber/configure.ac	Sat Nov 07 14:22:58 2015 +0200
-+++ b/mcabber/configure.ac	Sat Nov 07 14:55:06 2015 +0200
-@@ -284,7 +284,7 @@
+diff -r 3f04914d8643 mcabber/configure.ac
+--- a/mcabber/configure.ac	Sat Feb 27 13:53:01 2016 +0100
++++ b/mcabber/configure.ac	Fri Mar 04 13:54:06 2016 +0200
+@@ -293,7 +293,7 @@
  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
  
  # Prepare some config.h variables
@@ -123,9 +123,9 @@
  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
  
  # We need _GNU_SOURCE for strptime() and strcasestr()
-diff -r b47f104be890 mcabber/mcabber/api.h
---- a/mcabber/mcabber/api.h	Sat Nov 07 14:22:58 2015 +0200
-+++ b/mcabber/mcabber/api.h	Sat Nov 07 14:55:06 2015 +0200
+diff -r 3f04914d8643 mcabber/mcabber/api.h
+--- a/mcabber/mcabber/api.h	Sat Feb 27 13:53:01 2016 +0100
++++ b/mcabber/mcabber/api.h	Fri Mar 04 13:54:06 2016 +0200
 @@ -4,10 +4,10 @@
  #include <glib.h>
  #include <mcabber/config.h> // For MCABBER_BRANCH