Merge branch 'master' of github.com:graydon/rust

This commit is contained in:
Niko Matsakis 2011-11-17 11:52:56 -08:00
commit e7ad5978d9
2 changed files with 5 additions and 1 deletions

View file

@ -76,7 +76,6 @@ int check_claims = 0;
extern "C" CDECL int extern "C" CDECL int
rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) { rust_start(uintptr_t main_fn, int argc, char **argv, void* crate_map) {
fprintf(stderr, "rust_start, argc=%d argv=%p\n", argc, argv);
rust_env *env = load_env(); rust_env *env = load_env();

View file

@ -1,3 +1,8 @@
S 2011-11-17 a92699f
linux-i386 160fb4e75ebedc4b265169b6cbb161a5aab58c6a
macos-i386 ef9f703a15d99d69d1db24c674d2ed9693c4cef6
winnt-i386 207595af91428788e023e311154b1665e1643608
S 2011-11-16 045a437 S 2011-11-16 045a437
linux-i386 41cbc23f21b7978b8a029b1ddabadf67638c412a linux-i386 41cbc23f21b7978b8a029b1ddabadf67638c412a
macos-i386 938a3ec1f3d5e4634617e9b0ac8a451fb939b099 macos-i386 938a3ec1f3d5e4634617e9b0ac8a451fb939b099