Merge in changes from stable.
This commit is contained in:
commit
958ef1a7b9
|
@ -11,4 +11,5 @@ EPAUSE_IGNORE="1"
|
||||||
EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
|
EMERGE_DEFAULT_OPTS="--jobs=2 --autounmask=n"
|
||||||
FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch"
|
FEATURES="noinfo -test nodoc noman nostrip unmerge-orphans buildpkg notitles parallel-fetch"
|
||||||
CURL_SSL="openssl"
|
CURL_SSL="openssl"
|
||||||
|
PYTHON_TARGETS="python3_4"
|
||||||
ABI_X86="32"
|
ABI_X86="32"
|
||||||
|
|
Loading…
Reference in New Issue