diff options
author | Yash Tibrewal <yashkt@google.com> | 2019-01-04 14:03:37 -0800 |
---|---|---|
committer | Yash Tibrewal <yashkt@google.com> | 2019-01-04 14:03:37 -0800 |
commit | 6e5eb4e5a3276273d5cf6deb51b1835990ffea0f (patch) | |
tree | ff511cf369c76e9cf26779408a0d03c4ebf36752 /Makefile | |
parent | b05ca9697b9d28eb8fb4f3c9ad732667ed416f15 (diff) | |
parent | 89f7d619ef23e400e36f8906876a2633d943847e (diff) |
Merge branch 'master' into failhijackedrecv
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -438,8 +438,8 @@ Q = @ endif CORE_VERSION = 7.0.0-dev -CPP_VERSION = 1.18.0-dev -CSHARP_VERSION = 1.18.0-dev +CPP_VERSION = 1.19.0-dev +CSHARP_VERSION = 1.19.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) |