diff options
| author | Micael Karlberg <[email protected]> | 2011-03-17 16:02:02 +0100 |
|---|---|---|
| committer | Micael Karlberg <[email protected]> | 2011-03-17 16:02:02 +0100 |
| commit | 5cba72579ad75f85797aae14fde94fca6acf6406 (patch) | |
| tree | dcced80b5816741682d10f77d37e5a059c054e42 /lib/cosTime/doc/src | |
| parent | c959a0cd5392d356e8bda8d7eb9d0e71a88360b3 (diff) | |
| parent | f861b4fdb3fd39e35f2951c53a73b30a98c7f973 (diff) | |
| download | otp-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/cosTime/doc/src')
| -rw-r--r-- | lib/cosTime/doc/src/CosTime_TIO.xml | 2 | ||||
| -rw-r--r-- | lib/cosTime/doc/src/CosTime_TimeService.xml | 2 | ||||
| -rw-r--r-- | lib/cosTime/doc/src/CosTime_UTO.xml | 2 | ||||
| -rw-r--r-- | lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml | 2 | ||||
| -rw-r--r-- | lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml | 2 | ||||
| -rw-r--r-- | lib/cosTime/doc/src/cosTime.xml | 2 |
6 files changed, 6 insertions, 6 deletions
diff --git a/lib/cosTime/doc/src/CosTime_TIO.xml b/lib/cosTime/doc/src/CosTime_TIO.xml index 91aa34d8c8..7b955c64e3 100644 --- a/lib/cosTime/doc/src/CosTime_TIO.xml +++ b/lib/cosTime/doc/src/CosTime_TIO.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> diff --git a/lib/cosTime/doc/src/CosTime_TimeService.xml b/lib/cosTime/doc/src/CosTime_TimeService.xml index 9b20f24794..66cfb694e6 100644 --- a/lib/cosTime/doc/src/CosTime_TimeService.xml +++ b/lib/cosTime/doc/src/CosTime_TimeService.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> diff --git a/lib/cosTime/doc/src/CosTime_UTO.xml b/lib/cosTime/doc/src/CosTime_UTO.xml index 73784e50f6..26e6eef978 100644 --- a/lib/cosTime/doc/src/CosTime_UTO.xml +++ b/lib/cosTime/doc/src/CosTime_UTO.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> diff --git a/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml b/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml index bc1ef39132..4b2e57642a 100644 --- a/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.xml +++ b/lib/cosTime/doc/src/CosTimerEvent_TimerEventHandler.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> diff --git a/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml b/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml index 90eeb5b2c5..fb3fe747e5 100644 --- a/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.xml +++ b/lib/cosTime/doc/src/CosTimerEvent_TimerEventService.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> diff --git a/lib/cosTime/doc/src/cosTime.xml b/lib/cosTime/doc/src/cosTime.xml index 8bc80f2322..978e048d48 100644 --- a/lib/cosTime/doc/src/cosTime.xml +++ b/lib/cosTime/doc/src/cosTime.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> |