diff options
| author | Patrik Nyblom <[email protected]> | 2010-12-29 15:58:34 +0100 |
|---|---|---|
| committer | Patrik Nyblom <[email protected]> | 2010-12-29 15:58:34 +0100 |
| commit | a80e777da60fe15b30e73ebbe37bb2b5c145b91c (patch) | |
| tree | 565c4830c70ea6006b0f4096c389168dde33f64f /.gitignore | |
| parent | 3efa951f5acb6014fd48b9dd8c8d8f726fd7c58b (diff) | |
| parent | 86413606615440a7951b4c62162e2bfb87aa158c (diff) | |
| download | otp-a80e777da60fe15b30e73ebbe37bb2b5c145b91c.tar.gz otp-a80e777da60fe15b30e73ebbe37bb2b5c145b91c.tar.bz2 otp-a80e777da60fe15b30e73ebbe37bb2b5c145b91c.zip | |
Merge branch 'maint-r14' into dev
Conflicts:
lib/stdlib/vsn.mk
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions