merged fusion from the trunk

[SVN r63560]
This commit is contained in:
Christopher Schmidt
2010-07-03 20:10:58 +00:00
parent 649770fdcd
commit 1572e0e9c3
402 changed files with 4874 additions and 5055 deletions

View File

@ -48,7 +48,7 @@ namespace Core
} // namespace Core
int main(int argc, char* argv[])
int main()
{
std::tr1::tuple<int, int, int, int> test = Core::Demo();
return 0;