include/rays/painter.h in rays-0.1.2 vs include/rays/painter.h in rays-0.1.3

@@ -15,11 +15,11 @@
 
 
 	enum ShapeType
 	{
 
-		SHAPE_UNKNOWN  = UNKNOWN,
+		SHAPE_UNKNOWN  = Xot::UNKNOWN,
 
 		POINTS         = GL_POINTS,
 
 		LINES          = GL_LINES,
 
@@ -60,12 +60,12 @@
 
 			bool begin ();
 
 			bool end ();
 
-			bool push ();
+			bool push_matrix ();
 
-			bool pop ();
+			bool pop_matrix ();
 
 			//
 			// high level drawing methods
 			//
 			bool line (coord x1, coord y1, coord x2, coord y2);