Merge branch 'master' of someserver.de:/home/seba/projects/c++/libsegl/

2008-03-08 23:05:11 +01:00 · 2008-03-08 23:05:11 +01:00 · cca746e2f8
parent a233128818 e68632743e
commit cca746e2f8
2 changed files with 3 additions and 0 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,2 +1,3 @@
 *.o
 *.a
+testprog
--- a/testprog.cpp
+++ b/testprog.cpp
@ -8,5 +8,7 @@ int main() {
 	screen.setVideoMode(640, 480, 32);
 	screen.apply();

+	// whee
+
 	return 0;
 }