diff options
| author | Niclas Eklund <[email protected]> | 2011-03-14 13:59:01 +0100 |
|---|---|---|
| committer | Niclas Eklund <[email protected]> | 2011-03-14 13:59:01 +0100 |
| commit | 34534ab6f713c9b835e40e72fc23de0dd781da08 (patch) | |
| tree | 40c38f4c126c206eb03fab9af4e02181b87bdcfc /erts/vsn.mk | |
| parent | d53be747c945d5e86997e1944446795b271dacb4 (diff) | |
| parent | 67a4c9ae71f8159ac1b471faac0273977002ad80 (diff) | |
| download | otp-34534ab6f713c9b835e40e72fc23de0dd781da08.tar.gz otp-34534ab6f713c9b835e40e72fc23de0dd781da08.tar.bz2 otp-34534ab6f713c9b835e40e72fc23de0dd781da08.zip | |
Merge branch 'nick/CORBA/avoid_warnings/OTP-9050' into dev
* nick/CORBA/avoid_warnings/OTP-9050:
Corrected type of action in release notes.
Corrected version in release notes file.
Conflicts:
lib/cosProperty/doc/src/notes.xml
Diffstat (limited to 'erts/vsn.mk')
0 files changed, 0 insertions, 0 deletions