summaryrefslogtreecommitdiff
path: root/ares_version.h
diff options
context:
space:
mode:
authorYu Jiung <jiung.yu@samsung.com>2016-11-09 11:24:14 +0900
committerYu Jiung <jiung.yu@samsung.com>2016-11-09 11:24:20 +0900
commit04b1a8c051547b221a3bdd74d68ab02df3e3f752 (patch)
tree68d564a70d38771969fc9f946fb16792e8d4f7f7 /ares_version.h
parentf57d349bba373ddb713a249cb2866198346ae011 (diff)
parent8e609b5f488d486a9e066ed494218d966f489938 (diff)
downloadc-ares-04b1a8c051547b221a3bdd74d68ab02df3e3f752.tar.gz
c-ares-04b1a8c051547b221a3bdd74d68ab02df3e3f752.tar.bz2
c-ares-04b1a8c051547b221a3bdd74d68ab02df3e3f752.zip
Merge branch 'upstream' into tizen
Change-Id: If7b14a6bca2079b3cc58a0432a9eb05a41ea5ceb
Diffstat (limited to 'ares_version.h')
-rw-r--r--ares_version.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/ares_version.h b/ares_version.h
index 38e9e0d..92c8584 100644
--- a/ares_version.h
+++ b/ares_version.h
@@ -3,15 +3,15 @@
#define ARES__VERSION_H
/* This is the global package copyright */
-#define ARES_COPYRIGHT "2004 - 2013 Daniel Stenberg, <daniel@haxx.se>."
+#define ARES_COPYRIGHT "2004 - 2016 Daniel Stenberg, <daniel@haxx.se>."
#define ARES_VERSION_MAJOR 1
-#define ARES_VERSION_MINOR 11
+#define ARES_VERSION_MINOR 12
#define ARES_VERSION_PATCH 0
#define ARES_VERSION ((ARES_VERSION_MAJOR<<16)|\
(ARES_VERSION_MINOR<<8)|\
(ARES_VERSION_PATCH))
-#define ARES_VERSION_STR "1.11.0"
+#define ARES_VERSION_STR "1.12.0"
#if (ARES_VERSION >= 0x010700)
# define CARES_HAVE_ARES_LIBRARY_INIT 1