Merge remote-tracking branch 'origin/master'

Conflicts:
	data/src/hello/main1.go
This commit is contained in:
Van 2014-08-19 18:06:41 +08:00
commit 7f5fae9cc8
2 changed files with 10 additions and 4 deletions

View File

@ -2,11 +2,8 @@ package main
import ( import (
"fmt" "fmt"
"time"
) )
func main() { func main() {
fmt.Println("Hello, 世界") fmt.Println("Hello, 世界")
time.Sleep(time.Second)
} }

9
data/src/time/time.go Normal file
View File

@ -0,0 +1,9 @@
package main
import (
"fmt"
)
func main() {
fmt.Println("Hello, 世界")
}