Browse Source

Trying to get merge/cherry-pick order between branches right - technically, changes should occur in Release branches as patches or in feature branches and then be merged into master. Patches merged/cherry-picked into master, and master should always be merged into development feature branches. Will need to document this better, but it starts with ensuring the version info is right in the right places.

master
Krista Bennett 3 months ago
parent
commit
20d61f993b
1 changed files with 5 additions and 5 deletions
  1. +5
    -5
      src/pEpEngine.h

+ 5
- 5
src/pEpEngine.h View File

@ -21,15 +21,15 @@ extern "C" {
#include "labeled_int_list.h"
#include "timestamp.h"
#define PEP_VERSION "3.1" // pEp *protocol* version
#define PEP_VERSION "3.2" // pEp *protocol* version
// RELEASE version this targets
// (string: major.minor.patch)
#define PEP_ENGINE_VERSION "3.1.3"
#define PEP_ENGINE_VERSION "3.2.0"
#define PEP_ENGINE_VERSION_MAJOR 3
#define PEP_ENGINE_VERSION_MINOR 1
#define PEP_ENGINE_VERSION_PATCH 3
#define PEP_ENGINE_VERSION_RC 0
#define PEP_ENGINE_VERSION_MINOR 2
#define PEP_ENGINE_VERSION_PATCH 0
#define PEP_ENGINE_VERSION_RC 1
#define PEP_OWN_USERID "pEp_own_userId"


Loading…
Cancel
Save