diff options
| author | Björn Gustavsson <[email protected]> | 2013-04-18 13:49:02 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2013-04-18 13:49:02 +0200 |
| commit | 2e04fc33553703c17f2958dd7b02c22ba77322a0 (patch) | |
| tree | 6b6130aea4686c252cd788d7b4ce1a41be88617d /.gitignore | |
| parent | 96ecf847dbbf279f1005c98d513eae489ffac242 (diff) | |
| parent | 7da9c3dd86364771c0340f8ab173ca1875e7422f (diff) | |
| download | otp-2e04fc33553703c17f2958dd7b02c22ba77322a0.tar.gz otp-2e04fc33553703c17f2958dd7b02c22ba77322a0.tar.bz2 otp-2e04fc33553703c17f2958dd7b02c22ba77322a0.zip | |
Merge branch 'maint-r16' into maint
* maint-r16:
Prepare release
Prepare release
Do not count offline run-queues as empty
Prepare release
Prevent loss of objects after the extension marker
Don't lose the extension mark for object set parameters
Conflicts:
erts/vsn.mk
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions