From cbbd7333394f64f01cb6eee2177eace93980e225 Mon Sep 17 00:00:00 2001
From: Fabian Lennartz <lennartz@vr.rwth-aachen.de>
Date: Tue, 24 Apr 2018 12:41:57 +0200
Subject: [PATCH] Fix typo and add login to bintray

---
 .gitlab-ci.yml                                   | 8 ++++----
 tests/src/mocks/generation/Create_openGL_mock.py | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9e6a6f44..054d020a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -120,8 +120,8 @@ conan:linux:gcc5.3.1:
     - opengl
   script:
     - mkdir build
-    #- conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan
-    #- conan user -p %CONAN_PASSWORD% -r rwth-vr--bintray %CONAN_LOGIN_USERNAME%
+    - conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan
+    - conan user -p $CONAN_PASSWORD -r rwth-vr--bintray $CONAN_LOGIN_USERNAME
     - cd build
     - export CC=gcc
     - export CXX=g++
@@ -138,8 +138,8 @@ conan:linux:gcc6.3.1:
     - opengl
   script:
     - mkdir build
-    #- conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan
-    #- conan user -p %CONAN_PASSWORD% -r rwth-vr--bintray %CONAN_LOGIN_USERNAME%
+    - conan remote update rwth-vr--bintray https://api.bintray.com/conan/rwth-vr/conan
+    - conan user -p $CONAN_PASSWORD -r rwth-vr--bintray $CONAN_LOGIN_USERNAME
     - cd build
     - export CC=gcc
     - export CXX=g++
diff --git a/tests/src/mocks/generation/Create_openGL_mock.py b/tests/src/mocks/generation/Create_openGL_mock.py
index e113d900..b7e772d3 100644
--- a/tests/src/mocks/generation/Create_openGL_mock.py
+++ b/tests/src/mocks/generation/Create_openGL_mock.py
@@ -329,7 +329,7 @@ def Read_GLEW_methods():
     
 
 def Filter_GLEW_methods():
-    print "we delete methods that have mote than 15 parameters since trompeloeil has no mock macro for it"
+    print "we delete methods that have more than 15 parameters since trompeloeil has no mock macro for it"
     i = 0
     n = len(functions)
     while i < n:
-- 
GitLab