diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 10:40:19 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-05-11 10:40:19 -0700 |
| commit | 5532ae2c53b30f5ffab20b4fa3c7d15b6c4b9591 (patch) | |
| tree | 1345449ca4f7f10a0d38cfaab1cc88e33cde88d2 /Makefile | |
| parent | 65ad0a73cb4c2f144b86eca509ce7b2de576bb71 (diff) | |
| parent | b122e2ec9ff9c32b9ced1efbc02a06bc64178d9f (diff) | |
Merge branch 'churn-churn-churn-the-api-gently-down-the-stream' into we-dont-need-no-backup
Conflicts:
test/core/end2end/fixtures/chttp2_fullstack.c
test/core/end2end/fixtures/chttp2_fullstack_uds_posix.c
test/core/end2end/fixtures/chttp2_simple_ssl_fullstack.c
test/core/end2end/fixtures/chttp2_socket_pair.c
test/core/end2end/tests/cancel_after_accept.c
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -308,7 +308,7 @@ E = @echo Q = @ endif -VERSION = 0.7.0.0 +VERSION = 0.8.0.0 CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) |