瀏覽代碼

merging issues fixed

naelstrof 10 年之前
父節點
當前提交
9d72c917cb
共有 1 個文件被更改,包括 1 次插入0 次删除
  1. 1
    0
      main.cpp

+ 1
- 0
main.cpp 查看文件

20
     float r = options->m_red;
20
     float r = options->m_red;
21
     float g = options->m_green;
21
     float g = options->m_green;
22
     float b = options->m_blue;
22
     float b = options->m_blue;
23
+    timespec start, time;
23
     int cx = 0;
24
     int cx = 0;
24
     int cy = 0;
25
     int cy = 0;
25
 
26