Mercurial Mercurial > mcabber-isbear-patches / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
switch-to-experimental.diff
changeset 90 bed5beae28c5
parent 88 0a87df8ad9c1
child 92 66f7e2aa040c
equal deleted inserted replaced
89:ce4c4447dbd4 90:bed5beae28c5 
     1 # HG changeset patch
 
     1 # HG changeset patch
 
     2 # Parent  b47f104be890171410d9eae72a90508a162cb836
 
     2 # Parent  3f04914d86436042efad7477cf6be0ab67cfcc8d
 
     3 [local] Switch to experimental branch and api version
 
     3 [local] Switch to experimental branch and api version
 
     4 
     4 
     5 diff -r b47f104be890 mcabber/ChangeLog.api
 
     5 diff -r 3f04914d8643 mcabber/ChangeLog.api
 
     6 --- a/mcabber/ChangeLog.api	Sat Nov 07 14:22:58 2015 +0200
 
     6 --- a/mcabber/ChangeLog.api	Sat Feb 27 13:53:01 2016 +0100
 
     7 +++ b/mcabber/ChangeLog.api	Sat Nov 07 14:55:06 2015 +0200
 
     7 +++ b/mcabber/ChangeLog.api	Fri Mar 04 13:54:06 2016 +0200
 
     8 @@ -1,3 +1,12 @@
 
     8 @@ -1,3 +1,12 @@
 
     9 +experimental (45)
 
     9 +experimental (45)
 
    10 +
 
    10 +
 
    11 + * Change branch to "experimental".
 
    11 + * Change branch to "experimental".
 
    12 + * Api as defined by dev:41
 
    12 + * Api as defined by dev:41
 
    15 +
 
    15 +
 
    16 +  -- Myhailo Danylenko, 2015-11-07
 
    16 +  -- Myhailo Danylenko, 2015-11-07
 
    17 +
 
    17 +
 
    18  dev (41)
 
    18  dev (41)
 
    19  
    19  
    20   * Change prototype of otr_send()
 
    20   * Stable api 1.0.2:1
 
    21 @@ -36,6 +45,15 @@
 
    21 @@ -38,6 +47,15 @@
 
    22  
    22  
    23    -- Mikael Berthe, 2015-10-04
 
    23    -- Mikael Berthe, 2015-10-04
 
    24  
    24  
    25 +experimental (43)
 
    25 +experimental (43)
 
    26 +
 
    26 +
 
    32 +  -- Myhailo Danylenko, 2014-11-11
 
    32 +  -- Myhailo Danylenko, 2014-11-11
 
    33 +
 
    33 +
 
    34  dev (36)
 
    34  dev (36)
 
    35  
    35  
    36   * Change prototype of gpg_encrypt()
 
    36   * Change prototype of gpg_encrypt()
 
    37 @@ -118,6 +136,15 @@
 
    37 @@ -120,6 +138,15 @@
 
    38  
    38  
    39    -- Mikael Berthe, 2013-09-29
 
    39    -- Mikael Berthe, 2013-09-29
 
    40  
    40  
    41 +experimental (41)
 
    41 +experimental (41)
 
    42 +
 
    42 +
 
    48 +  -- Myhailo Danylenko, 2012-11-30
 
    48 +  -- Myhailo Danylenko, 2012-11-30
 
    49 +
 
    49 +
 
    50  dev (26)
 
    50  dev (26)
 
    51  
    51  
    52   * Changeset 69699ba3010f
 
    52   * Changeset 69699ba3010f
 
    53 @@ -127,6 +154,15 @@
 
    53 @@ -129,6 +156,15 @@
 
    54  
    54  
    55    -- Mikael Berthe, 2013-04-28
 
    55    -- Mikael Berthe, 2013-04-28
 
    56  
    56  
    57 +experimental (39)
 
    57 +experimental (39)
 
    58 +
 
    58 +
 
    64 +  -- Myhailo Danylenko, 2012-11-30
 
    64 +  -- Myhailo Danylenko, 2012-11-30
 
    65 +
 
    65 +
 
    66  dev (25)
 
    66  dev (25)
 
    67  
    67  
    68   * Stable api 0.10.2:1
 
    68   * Stable api 0.10.2:1
 
    69 @@ -135,6 +171,15 @@
 
    69 @@ -137,6 +173,15 @@
 
    70  
    70  
    71    -- Mikael Berthe, 2012-11-28
 
    71    -- Mikael Berthe, 2012-11-28
 
    72  
    72  
    73 +experimental (37)
 
    73 +experimental (37)
 
    74 +
 
    74 +
 
    80 +  -- Myhailo Danylenko, 2012-10-18
 
    80 +  -- Myhailo Danylenko, 2012-10-18
 
    81 +
 
    81 +
 
    82  dev (24)
 
    82  dev (24)
 
    83  
    83  
    84   * Changeset 0cb8ea02e472
 
    84   * Changeset 0cb8ea02e472
 
    85 @@ -144,6 +189,15 @@
 
    85 @@ -146,6 +191,15 @@
 
    86  
    86  
    87    -- Myhailo Danylenko, 2012-10-20
 
    87    -- Myhailo Danylenko, 2012-10-20
 
    88  
    88  
    89 +experimental (35)
 
    89 +experimental (35)
 
    90 +
 
    90 +
 
    96 +  -- Myhailo Danylenko, 2012-04-30
 
    96 +  -- Myhailo Danylenko, 2012-04-30
 
    97 +
 
    97 +
 
    98  dev (23)
 
    98  dev (23)
 
    99  
    99  
   100   * Changeset 8dc418af3e72
 
   100   * Changeset 8dc418af3e72
 
   101 @@ -165,6 +219,12 @@
 
   101 @@ -167,6 +221,12 @@
 
   102  
   102  
   103    -- Hermitifier, 2011-10-03
 
   103    -- Hermitifier, 2011-10-03
 
   104  
   104  
   105 +experimental (34)
 
   105 +experimental (34)
 
   106 +
 
   106 +
 
   109 +  -- Myhailo Danylenko, 2011-06-01
 
   109 +  -- Myhailo Danylenko, 2011-06-01
 
   110 +
 
   110 +
 
   111  dev (20)
 
   111  dev (20)
 
   112  
   112  
   113   * Add cmd_set_safe() and cmd_is_safe()
 
   113   * Add cmd_set_safe() and cmd_is_safe()
 
   114 diff -r b47f104be890 mcabber/configure.ac
 
   114 diff -r 3f04914d8643 mcabber/configure.ac
 
   115 --- a/mcabber/configure.ac	Sat Nov 07 14:22:58 2015 +0200
 
   115 --- a/mcabber/configure.ac	Sat Feb 27 13:53:01 2016 +0100
 
   116 +++ b/mcabber/configure.ac	Sat Nov 07 14:55:06 2015 +0200
 
   116 +++ b/mcabber/configure.ac	Fri Mar 04 13:54:06 2016 +0200
 
   117 @@ -284,7 +284,7 @@
 
   117 @@ -293,7 +293,7 @@
 
   118  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
 
   118  AM_CONDITIONAL([INSTALL_HEADERS], [test x$enable_modules != xno])
 
   119  
   119  
   120  # Prepare some config.h variables
 
   120  # Prepare some config.h variables
 
   121 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
 
   121 -AC_DEFINE([MCABBER_BRANCH], "dev", [Mcabber branch])
 
   122 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
 
   122 +AC_DEFINE([MCABBER_BRANCH], "experimental", [Mcabber branch])
 
   123  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
 
   123  AC_DEFINE([MCABBER_VERSION], "AC_PACKAGE_VERSION", [Mcabber version string])
 
   124  
   124  
   125  # We need _GNU_SOURCE for strptime() and strcasestr()
 
   125  # We need _GNU_SOURCE for strptime() and strcasestr()
 
   126 diff -r b47f104be890 mcabber/mcabber/api.h
 
   126 diff -r 3f04914d8643 mcabber/mcabber/api.h
 
   127 --- a/mcabber/mcabber/api.h	Sat Nov 07 14:22:58 2015 +0200
 
   127 --- a/mcabber/mcabber/api.h	Sat Feb 27 13:53:01 2016 +0100
 
   128 +++ b/mcabber/mcabber/api.h	Sat Nov 07 14:55:06 2015 +0200
 
   128 +++ b/mcabber/mcabber/api.h	Fri Mar 04 13:54:06 2016 +0200
 
   129 @@ -4,10 +4,10 @@
 
   129 @@ -4,10 +4,10 @@
 
   130  #include <glib.h>
 
   130  #include <glib.h>
 
   131  #include <mcabber/config.h> // For MCABBER_BRANCH
 
   131  #include <mcabber/config.h> // For MCABBER_BRANCH
 
   132  
   132  
   133 -#define MCABBER_API_VERSION 41
 
   133 -#define MCABBER_API_VERSION 41
mcabber-isbear-patches