Merged git://github.com/the-zett/swift
authorVictor Grishchenko <victor.grishchenko@gmail.com>
Tue, 26 Jan 2010 17:15:05 +0000 (18:15 +0100)
committerVictor Grishchenko <victor.grishchenko@gmail.com>
Tue, 26 Jan 2010 17:15:05 +0000 (18:15 +0100)
commit9316d91a75380d2568df14438eb6dbe83b9975f8
tree6f0f078c66ae37185407ca2974156cfaab549abb
parent86a80abbabd98716460a27f1ea1b8773bf3c68cd
parent284b47a69ac4fc23b4d245bf4d77297b109c8c93
Merged git://github.com/the-zett/swift

Conflicts:
compat/hirestimeofday.cpp
compat/hirestimeofday.h
compat/util.cpp
compat/util.h
bins.cpp
compat/hirestimeofday.cpp
compat/hirestimeofday.h
compat/util.cpp
compat/util.h