diff options
| author | Björn Gustavsson <[email protected]> | 2010-09-01 15:13:37 +0200 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2010-09-01 15:13:37 +0200 |
| commit | ca9ab3d500ddae0c08dca4d389a975f020fbddcc (patch) | |
| tree | e440d022e200742c1bfa93bf947dcf4c70b2dd0a /erts/emulator/beam/time.c | |
| parent | 40436debcac9645817c4799fe27d32b6bfa8fddd (diff) | |
| parent | 76ac94968e28fb4b0dc38ed7062849efe61c50e6 (diff) | |
| download | otp-ca9ab3d500ddae0c08dca4d389a975f020fbddcc.tar.gz otp-ca9ab3d500ddae0c08dca4d389a975f020fbddcc.tar.bz2 otp-ca9ab3d500ddae0c08dca4d389a975f020fbddcc.zip | |
Merge branch 'maint-r13' into dev
* maint-r13:
Remove copyright headers in vsn.mk files
Conflicts:
lib/appmon/vsn.mk
lib/erl_docgen/vsn.mk
lib/inets/vsn.mk
lib/kernel/vsn.mk
lib/reltool/vsn.mk
lib/ssl/vsn.mk
lib/stdlib/vsn.mk
lib/tools/vsn.mk
lib/tv/vsn.mk
lib/xmerl/vsn.mk
Diffstat (limited to 'erts/emulator/beam/time.c')
0 files changed, 0 insertions, 0 deletions