diff options
| author | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:02:55 +0200 |
|---|---|---|
| committer | Fredrik Gustafsson <[email protected]> | 2013-09-30 17:02:55 +0200 |
| commit | e0ecc86e35475b434efa6cccba44074ca1040b7a (patch) | |
| tree | 13f1622acea6b0af4536eb739af58a351b1fb8bf /lib/jinterface | |
| parent | e6b5ae09d292ee0251aab875be1d3245f260b493 (diff) | |
| parent | abac2eda110a33d8310c0f9cc152d91de37f731d (diff) | |
| download | otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.gz otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.tar.bz2 otp-e0ecc86e35475b434efa6cccba44074ca1040b7a.zip | |
Merge branch 'maint-r16' into maint
Conflicts:
erts/vsn.mk
Diffstat (limited to 'lib/jinterface')
0 files changed, 0 insertions, 0 deletions