# HG changeset patch # User tkaito@henri # Date 1292558348 -32400 # Node ID ae5db88526f8fe5d0503a3eb2ba0c768169a52a3 # Parent 9061d19b855066d4965575e53d3b6d089aeb78ad# Parent 849a1c2330804aa4c9562e07d64767c471fc6191 merge diff -r 9061d19b8550 -r ae5db88526f8 Renderer/Test/MyFunc.h --- 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" }; -