Mercurial > hg > Game > Cerium
changeset 1086:ae5db88526f8 draft
merge
author | tkaito@henri |
---|---|
date | Fri, 17 Dec 2010 12:59:08 +0900 |
parents | 9061d19b8550 (current diff) 849a1c233080 (diff) |
children | 20f09564c586 |
files | Renderer/Test/MyFunc.h |
diffstat | 1 files changed, 3 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Renderer/Test/MyFunc.h Fri Dec 17 12:57:01 2010 +0900 +++ b/Renderer/Test/MyFunc.h Fri Dec 17 12:59:08 2010 +0900 @@ -1,9 +1,9 @@ enum { #include "SysTasks.h" #include "RenderingTasks.h" -PropertyTask, -ChainTask, -UniverseTask + PropertyTask, + ChainTask, + UniverseTask }; enum { @@ -11,4 +11,3 @@ #include "global_alloc.h" #include "KeyID.h" }; -