From 1a7e15a63d78a6351028d977b90052f6b0d6bf7d Mon Sep 17 00:00:00 2001
From: Comment <tim@gray.(none)>
Date: Fri, 28 Jun 2013 23:32:10 +0100
Subject: first performance version

---
 06_performance/src/main.cpp | 4 ++++
 1 file changed, 4 insertions(+)

(limited to '06_performance/src/main.cpp')

diff --git a/06_performance/src/main.cpp b/06_performance/src/main.cpp
index 733d488..464bd9d 100644
--- a/06_performance/src/main.cpp
+++ b/06_performance/src/main.cpp
@@ -5,7 +5,11 @@
 int main( ){
 
 	//ofSetupOpenGL(4080,768, OF_WINDOW);			// <-------- setup the GL context
+<<<<<<< HEAD
+	ofSetupOpenGL(2400,450, OF_WINDOW);			// <-------- setup the GL context
+=======
 	ofSetupOpenGL(1400,262, OF_WINDOW);			// <-------- setup the GL context
+>>>>>>> fd8dc2aa23c4bbc297e835e4f920aaf5342aba5e
 
 
 
-- 
cgit v1.2.3