diff options
| author |  Yash Tibrewal <yashkt@google.com> | 2019-01-07 10:09:06 -0800 |
|---|---|---|
| committer | Yash Tibrewal <yashkt@google.com> | 2019-01-07 10:09:06 -0800 |
| commit | dd067fd39034d42bf9a1799d09c1c2a7daedc61a (patch) | |
| tree | edb1db69a990b7ade9c25f2e4890ede8596c703f /Makefile | |
| parent | 7d1491d64c9b6279233c780d290c514a7040c1c7 (diff) | |
| parent | 46bd2f7adb926053345665d5c487fa20acd2b5b0 (diff) | |
Merge branch 'master' into nocopyinterception
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) |