aboutsummaryrefslogtreecommitdiffstats
path: root/.gitattributes
diff options
context:
space:
mode:
authorBjörn Gustavsson <[email protected]>2010-10-21 14:31:33 +0200
committerBjörn Gustavsson <[email protected]>2010-10-21 14:31:33 +0200
commit4bf6acc06b5a6b155caebbf575ce524a0fedd75a (patch)
tree542afae453222edf944a644cc70c904da0ecf30b /.gitattributes
parent5fcb6e185734a42ff8236a1ee2626b0adfc3c65e (diff)
parent1419cda9991775c51a931ef63a51da477391722c (diff)
downloadotp-4bf6acc06b5a6b155caebbf575ce524a0fedd75a.tar.gz
otp-4bf6acc06b5a6b155caebbf575ce524a0fedd75a.tar.bz2
otp-4bf6acc06b5a6b155caebbf575ce524a0fedd75a.zip
Merge branch 'maint-r14' into dev
* maint-r14: Prepare release Fix that the documentation top index generator can handle an Ericsson internal application group Teach -init_debug to print info about on_load handlers begin run Fix hang in on_load handlers in embedded mode Conflicts: erts/vsn.mk lib/kernel/vsn.mk
Diffstat (limited to '.gitattributes')
0 files changed, 0 insertions, 0 deletions