diff options
| author | Björn Gustavsson <[email protected]> | 2017-03-09 15:27:55 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2017-03-09 15:27:55 +0100 |
| commit | 1f38a7d26ef86676ad6be0d2bce9b65c1f87253b (patch) | |
| tree | fb70bcedf4e1c7bb7963d5f8baaf16324da5111a /.gitattributes | |
| parent | a6073a25aae43d17c8afa9a976cbe310552cb811 (diff) | |
| parent | a2a8721ba6770dade9b7cbc9b4d6bf953bb355fd (diff) | |
| download | otp-1f38a7d26ef86676ad6be0d2bce9b65c1f87253b.tar.gz otp-1f38a7d26ef86676ad6be0d2bce9b65c1f87253b.tar.bz2 otp-1f38a7d26ef86676ad6be0d2bce9b65c1f87253b.zip | |
Merge branch 'maint'
* maint:
Travis CI: Add building of Erlang/OTP on 32-bit Linux
Run the smoke test for both SMP and non-SMP emulator
run-smoke-test: Let ERL_TOP default to current working directory
build-docker-otp: Avoid copying the git repository to docker daemon
builder-docker-otp: Fix passing of command
Reduce number of jobs for make
Add docker images for building 32/64 bit erlang
Travis CI: Change the language to C
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions