Skip to content

Commit 065ec48

Browse files
committed
---
yaml --- r: 64596 b: refs/heads/snap-stage3 c: 73ab6c6 h: refs/heads/master v: v3
1 parent 1e6fe01 commit 065ec48

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 155470fc9cd8e1cdfd0f6ecc558f865f54c1ef29
4+
refs/heads/snap-stage3: 73ab6c60f37263871a5e69f3eeaad72f0d804a02
55
refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/rt/io/timer.rs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
1-
// copyright 2013 the rust project developers. see the copyright
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
22
// file at the top-level directory of this distribution and at
3-
// http://rust-lang.org/copyright.
3+
// http://rust-lang.org/COPYRIGHT.
44
//
5-
// licensed under the apache license, version 2.0 <license-apache or
6-
// http://www.apache.org/licenses/license-2.0> or the mit license
7-
// <license-mit or http://opensource.org/licenses/mit>, at your
8-
// option. this file may not be copied, modified, or distributed
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10+
1011
use option::{Option, Some, None};
1112
use result::{Ok, Err};
1213
use rt::io::{io_error};

0 commit comments

Comments
 (0)