diff options
| author |  Vijay Pai <vpai@google.com> | 2018-02-24 10:37:13 -0600 |
|---|---|---|
| committer | Vijay Pai <vpai@google.com> | 2018-02-24 10:37:13 -0600 |
| commit | 8b05d0284f6aaaa2a9567f992189bef91550a645 (patch) | |
| tree | f81d3def61ca3345bdc133b8d12cae9af15c5300 /Makefile | |
| parent | d71b55db98fe6eec1c5207a335209da2a0c56449 (diff) | |
| parent | d5b1f9809202bf2338f94a9e1c07bc511b42d67d (diff) | |
Merge branch 'master' into 2phase_thd
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -419,8 +419,8 @@ Q = @ endif CORE_VERSION = 6.0.0-dev -CPP_VERSION = 1.10.0-dev -CSHARP_VERSION = 1.10.0-dev +CPP_VERSION = 1.11.0-dev +CSHARP_VERSION = 1.11.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) |