diff options
| author | Thomas Schwinge <thomas@schwinge.name> | 2015-01-21 22:04:35 +0100 |
|---|---|---|
| committer | Thomas Schwinge <thomas@schwinge.name> | 2015-01-21 22:04:35 +0100 |
| commit | befe7362ecf114c057355d8303bb9718b5133db2 (patch) | |
| tree | 160514dc56ad4dec200683ab500ba1b61e297c3e /Versions.def | |
| parent | 89502430391de303d858423ec70670f2191daac9 (diff) | |
| parent | 5d8116626e131b26c25bce6173badfd78ce36786 (diff) | |
Merge remote-tracking branch 'refs/remotes/savannah/top-bases/tschwinge/Roger_Whittaker' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
Versions.def
Diffstat (limited to 'Versions.def')
| -rw-r--r-- | Versions.def | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Versions.def b/Versions.def index d834b10479..d7982bf636 100644 --- a/Versions.def +++ b/Versions.def @@ -105,6 +105,7 @@ libpthread { GLIBC_2.6 GLIBC_2.11 GLIBC_2.12 + GLIBC_2.17 GLIBC_2.18 GLIBC_PRIVATE } |