diff options
| author | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:04:05 -0700 |
|---|---|---|
| committer | Nicolas "Pixel" Noble <pixel@nobis-crew.org> | 2012-09-01 10:27:52 -0700 |
| commit | 4a893f72cadaa875a920db8949171b002f656e43 (patch) | |
| tree | 1e08a3cb6f579cab9c3c9a138d36ababdf76121b /Makefile | |
| parent | 56d91ddd2cd42b782cde0bb3fdf4eb9ebe7597be (diff) | |
| parent | 06674e57649d536cf19715524ee40c5ad4a9026d (diff) | |
Merge commit '06674e57649d536cf19715524ee40c5ad4a9026d'
Conflicts:
includes/LuaTask.h
includes/TaskMan.h
includes/Threads.h
src/TaskMan.cc
src/Threads.cc
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -118,6 +118,7 @@ Exceptions.cc \ \ Local.cc \ Threads.cc \ +Async.cc \ \ BString.cc \ Main.cc \ @@ -178,6 +179,7 @@ test-Sanity.cc \ test-String.cc \ test-Tasks.cc \ test-Threads.cc \ +test-Async.cc \ test-Handles.cc \ test-Sockets.cc \ test-Http.cc \ |