rename file and fix merge error

2014-07-16 18:30:04 -07:00
parent 4d1d2c5d5d
commit c1a64dc5fa
2 changed files with 2 additions and 0 deletions
--- a/common/headless_view.cpp
+++ b/common/headless_view.cpp
@@ -1,6 +1,8 @@
 #include "headless_view.hpp"
 #include <llmr/util/timer.hpp>

+namespace llmr {
+
 HeadlessView::HeadlessView() {
 #if LLMR_USE_CGL
    // TODO: test if OpenGL 4.1 with GL_ARB_ES2_compatibility is supported
--- a/test/comparisons.cpp
+++ b/test/comparisons.cpp