Skip to content

Commit cdf591e

Browse files
authored
Merge pull request Tencent#93 from LawrenceHan/master
Added basic message ui.
2 parents 4895336 + a45a6d7 commit cdf591e

File tree

143 files changed

+48001
-21494
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+48001
-21494
lines changed

mars/comm/verinfo.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
#ifndef Mars_verinfo_h
33
#define Mars_verinfo_h
44

5-
#define MARS_REVISION "ab6c6dd"
6-
#define MARS_PATH "hotfix/1.x"
5+
#define MARS_REVISION "dfebb49"
6+
#define MARS_PATH "master"
77
#define MARS_URL ""
8-
#define MARS_BUILD_TIME "2016-12-29 19:57:02"
9-
#define MARS_TAG "fffff_[2016-12-29_19.56]@git-ab6c6dd@garry"
8+
#define MARS_BUILD_TIME "2017-01-10 21:41:50"
9+
#define MARS_TAG "samplelibs"
1010

1111
#endif

samples/iOS/iOSDemo/Proto/Chat.pb.h

Lines changed: 0 additions & 209 deletions
This file was deleted.

0 commit comments

Comments
 (0)