Merge master and resolve conflicts

1 files changed, 3 insertions, 3 deletions

diff --git a/src/GudhUI/view/View_parameter.h b/src/GudhUI/view/View_parameter.h
index dfd3aa41..3671f4fb 100644
--- a/src/GudhUI/view/View_parameter.h
+++ b/src/GudhUI/view/View_parameter.h
@@ -52,13 +52,13 @@ class View_parameter {
   void change_vertex_mode() {
     int current_value = vertex_mode;
     vertex_mode = static_cast<VERTEX_MODE> (++current_value % V_COUNT);
-    std::cout << "Vertex mode : ";
+    std::clog << "Vertex mode : ";
     switch (vertex_mode) {
       case V_NONE:
-        std::cout << "empty\n";
+        std::clog << "empty\n";
         break;
       case V_SIMPLE:
-        std::cout << "simple\n";
+        std::clog << "simple\n";
         break;
       default:
         break;