diff options
| author | Micael Karlberg <[email protected]> | 2011-03-18 12:08:44 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-18 12:08:44 +0100 |
| commit | e343c5b24ca4d642f327e6ec57d63094b28b2838 (patch) | |
| tree | 2f86813124b3d6a3f1b44b732674cfd2dfa6509a /lib/mnesia | |
| parent | 588a0d9c86b1b85a2cd7635460564ddaac566882 (diff) | |
| parent | 6b1d1ab0a27e9ed08a626e18319beb91d0a0d5ce (diff) | |
| download | otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.tar.gz otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.tar.bz2 otp-e343c5b24ca4d642f327e6ec57d63094b28b2838.zip | |
Merge branch 'bmk/inets/ftp/missing_spec_causes_dialyxer_problems/OTP-9114' into bmk/inets/inet56_integration
Conflicts:
lib/inets/doc/src/notes.xml
lib/inets/src/inets_app/inets.appup.src
Diffstat (limited to 'lib/mnesia')
| -rw-r--r-- | lib/mnesia/doc/src/notes.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mnesia/doc/src/notes.xml b/lib/mnesia/doc/src/notes.xml index ccf70b8373..f800868c01 100644 --- a/lib/mnesia/doc/src/notes.xml +++ b/lib/mnesia/doc/src/notes.xml @@ -4,7 +4,7 @@ <chapter> <header> <copyright> - <year>1996</year><year>2010</year> + <year>1996</year><year>2011</year> <holder>Ericsson AB. All Rights Reserved.</holder> </copyright> <legalnotice> |