diff options
| author | Lars Thorsen <[email protected]> | 2016-03-15 12:46:28 +0100 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2016-03-15 12:46:28 +0100 |
| commit | 12c3609f15dbe367684ecb506b61f07c15205c51 (patch) | |
| tree | 26f2b4f74dfb10b8854801c7259eb5acd92113f5 /erts/emulator/sys/win32/sys_time.c | |
| parent | 5eb0a3f256d6f816ebd56ba5d991eecaf580dd88 (diff) | |
| parent | 5e1b5ef47f3f2b898d30e0425823835bd9a574d4 (diff) | |
| download | otp-12c3609f15dbe367684ecb506b61f07c15205c51.tar.gz otp-12c3609f15dbe367684ecb506b61f07c15205c51.tar.bz2 otp-12c3609f15dbe367684ecb506b61f07c15205c51.zip | |
Merge tag 'OTP-18.3'
=== OTP-18.3 ===
Changed Applications:
- asn1-4.0.2
- common_test-1.12
- compiler-6.0.3
- cosNotification-1.2.1
- cosTime-1.2.1
- cosTransactions-1.3.1
- crypto-3.6.3
- debugger-4.1.2
- dialyzer-2.9
- diameter-1.11.2
- edoc-0.7.18
- eldap-1.2.1
- erl_docgen-0.4.2
- erl_interface-3.8.2
- erts-7.3
- eunit-2.2.13
- hipe-3.15
- inets-6.2
- kernel-4.2
- mnesia-4.13.3
- observer-2.1.2
- orber-3.8.1
- public_key-1.1.1
- runtime_tools-1.9.3
- sasl-2.7
- snmp-5.2.2
- ssh-4.2.2
- ssl-7.3
- stdlib-2.8
- test_server-3.10
- tools-2.8.3
- webtool-0.9.1
- wx-1.6.1
- xmerl-1.3.10
Unchanged Applications:
- cosEvent-2.2
- cosEventDomain-1.2
- cosFileTransfer-1.2
- cosProperty-1.2
- et-1.5.1
- gs-1.6
- ic-4.4
- jinterface-1.6.1
- megaco-3.18
- odbc-2.11.1
- os_mon-2.4
- ose-1.1
- otp_mibs-1.1
- parsetools-2.1.1
- percept-0.8.11
- reltool-0.7
- syntax_tools-1.7
- typer-0.9.10
Conflicts:
OTP_VERSION
erts/vsn.mk
lib/test_server/doc/src/notes.xml
lib/test_server/vsn.mk
lib/webtool/doc/src/notes.xml
lib/webtool/vsn.mk
Diffstat (limited to 'erts/emulator/sys/win32/sys_time.c')
0 files changed, 0 insertions, 0 deletions