diff options
| author | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-24 13:25:30 -0500 |
|---|---|---|
| committer | Morgan Deters <mdeters@cs.nyu.edu> | 2013-12-24 13:25:30 -0500 |
| commit | a70dfd183b52f50d132d8b17425c7089a77004e7 (patch) | |
| tree | 41d783cff1f6097bd76b77c561bbd77111317437 /src/main/portfolio.cpp | |
| parent | 371fa29e5742a58581481f3d7d94a8116a814447 (diff) | |
| parent | e23a40c0d121209afecff21ce5c6ed6e644bfb0e (diff) | |
Merge branch '1.3.x'
Conflicts:
NEWS
Diffstat (limited to 'src/main/portfolio.cpp')
| -rw-r--r-- | src/main/portfolio.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/main/portfolio.cpp b/src/main/portfolio.cpp index 56a05795a..21c1b60a3 100644 --- a/src/main/portfolio.cpp +++ b/src/main/portfolio.cpp @@ -38,7 +38,7 @@ int global_winner; template<typename S> void runThread(int thread_id, boost::function<S()> threadFn, S& returnValue) { - /* Uncommment line to delay first thread, useful to unearth errors/debug */ + /* Uncomment line to delay first thread, useful to unearth errors/debug */ // if(thread_id == 0) { sleep(1); } returnValue = threadFn(); |