Mercurial > hg > Members > kono > Cerium

changeset 1044:150412ed980a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
minor fix
author Shinji KONO <kono@ie.u-ryukyu.ac.jp>
date Wed, 08 Dec 2010 00:05:31 +0900
parents 283b15633c0f
children ab1378fc4f72
files Renderer/Engine/Application.h
diffstat 1 files changed, 1 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Renderer/Engine/Application.h	Wed Dec 08 00:04:02 2010 +0900
+++ b/Renderer/Engine/Application.h	Wed Dec 08 00:05:31 2010 +0900
@@ -15,11 +15,7 @@
     Application();
     virtual ~Application();
 
-<<<<<<< local
-    virtual bool app_main(Viewer *viewer){ return 1; /* use all execute */ };
-=======
-    virtual void app_loop(Viewer *viewer){};
->>>>>>> other
+    virtual bool app_loop(Viewer *viewer){ return 1; /* use all execute */ };
     virtual HTaskPtr application_task(HTaskPtr next, Viewer* viewer){return next;};
     virtual MainLoopPtr init(Viewer *viewer, int w, int h)  = 0;
 };