diff options
| author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:59:08 +0900 |
|---|---|---|
| committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:59:08 +0900 |
| commit | 6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9 (patch) | |
| tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /ares_version.h | |
| parent | d82f8426a5e255f0533f07ee458870ba124f90e7 (diff) | |
| parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
| download | c-ares-816653b30c1dcb6e5717154e3cf863bdadc63558.tar.gz c-ares-816653b30c1dcb6e5717154e3cf863bdadc63558.tar.bz2 c-ares-816653b30c1dcb6e5717154e3cf863bdadc63558.zip | |
Merge branch 'tizen' into tizen_3.0_basesubmit/tizen_3.0_base/20161116.053912submit/tizen_3.0.m2_base/20170104.073748submit/tizen_3.0.m2_base/20170104.072059accepted/tizen/3.0/base/20161118.080913accepted/tizen/3.0.m2/base/20170104.082100tizen_3.0.m2_baseaccepted/tizen_3.0.m2_base
Conflicts:
packaging/c-ares.spec
Change-Id: Id23d5351f77b4520d8bbcc4c0e1eb09136018b58
Diffstat (limited to 'ares_version.h')
| -rw-r--r-- | ares_version.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ares_version.h b/ares_version.h index cdd4992..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 10 +#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.10.0-DEV" +#define ARES_VERSION_STR "1.12.0" #if (ARES_VERSION >= 0x010700) # define CARES_HAVE_ARES_LIBRARY_INIT 1 |