From 2d9e0b75e4f66dd27d2223d0ff93a28cf4e9cb01 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Tue, 24 May 2011 14:57:46 +0100
Subject: [PATCH] jacksonmj's decorations commit

---
 src/main.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/main.c b/src/main.c
index e2b872fca..d1d837656 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2022,6 +2022,7 @@ int main(int argc, char *argv[])
 			{
 				if (sdl_mod & KMOD_CTRL)
 				{
+<<<<<<< HEAD
 					decorations_enable = !decorations_enable;
 					itc = 51;
 					if (decorations_enable) strcpy(itc_msg, "Decorations layer: On");
@@ -2033,6 +2034,19 @@ int main(int argc, char *argv[])
 					decorations_enable = 1;
 					sys_pause=1;
 				}
+=======
+         				decorations_enable = !decorations_enable;
+          				itc = 51;
+        				if (decorations_enable) strcpy(itc_msg, "Decorations layer: On");
+        				else strcpy(itc_msg, "Decorations layer: Off");	
+       				 }	
+       				 else	
+       				 {	
+        				decorations_ui(vid_buf,decorations,&bsx,&bsy);//decoration_mode = !decoration_mode;
+        				decorations_enable = 1;
+					sys_pause=1;	
+       				 }
+>>>>>>> fb9f01d... jacksonmj's decoration commit
 			}
 			if (sdl_key=='g')
 			{