aboutsummaryrefslogtreecommitdiffstats
path: root/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
diff options
context:
space:
mode:
authorMicael Karlberg <[email protected]>2011-03-17 16:02:02 +0100
committerMicael Karlberg <[email protected]>2011-03-17 16:02:02 +0100
commit5cba72579ad75f85797aae14fde94fca6acf6406 (patch)
treedcced80b5816741682d10f77d37e5a059c054e42 /lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
parentc959a0cd5392d356e8bda8d7eb9d0e71a88360b3 (diff)
parentf861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff)
downloadotp-5cba72579ad75f85797aae14fde94fca6acf6406.tar.gz
otp-5cba72579ad75f85797aae14fde94fca6acf6406.tar.bz2
otp-5cba72579ad75f85797aae14fde94fca6acf6406.zip
Merge branch 'dev' into bmk/inets/httpc/support_upload_body_streaming/OTP-9094
Conflicts: lib/inets/doc/src/notes.xml Fixed release notes after merge.
Diffstat (limited to 'lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml')
-rw-r--r--lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml b/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
index e5050eaffb..bef7cb882f 100644
--- a/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
+++ b/lib/cosFileTransfer/doc/src/CosFileTransfer_File.xml
@@ -5,7 +5,7 @@
<header>
<copyright>
<year>2000</year>
- <year>2007</year>
+ <year>2011</year>
<holder>Ericsson AB, All Rights Reserved</holder>
</copyright>
<legalnotice>