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_gethostbyname.3 | |
| parent | d82f8426a5e255f0533f07ee458870ba124f90e7 (diff) | |
| parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
| download | c-ares-accepted/tizen/3.0/base/20161118.080913.tar.gz c-ares-accepted/tizen/3.0/base/20161118.080913.tar.bz2 c-ares-accepted/tizen/3.0/base/20161118.080913.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_gethostbyname.3')
0 files changed, 0 insertions, 0 deletions