Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-12-17 01:24:15 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into android

Browse source
This commit is contained in:
Gio 2016-09-04 15:16:57 +02:00
commit 9d83d56811
133 changed files with 3895 additions and 729 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libretroshare/src/retroshare/rsversion.h
View file

@ -1,8 +1,7 @@
#define RS_MAJOR_VERSION 0
#define RS_MINOR_VERSION 6
#define RS_BUILD_NUMBER 0
#define RS_BUILD_NUMBER 1
#define RS_BUILD_NUMBER_ADD "x" // <-- do we need this?
// The revision number should be the 4 first bytes of the git revision hash, which is obtained using:
// git log --pretty="%H" | head -1 | cut -c1-8
//

2
libretroshare/src/retroshare/rsversion.in
View file

@ -1,6 +1,6 @@
#define RS_MAJOR_VERSION 0
#define RS_MINOR_VERSION 6
#define RS_BUILD_NUMBER 0
#define RS_BUILD_NUMBER 1
#define RS_BUILD_NUMBER_ADD ""
// The revision number should be the 4 first bytes of the git revision hash, which is obtained using: