From d511ed7b03fe2691da4fadb9adafc2d785f55f6e Mon Sep 17 00:00:00 2001
From: Yamagi Burmeister <yamagi@yamagi.org>
Date: Sat, 15 Oct 2011 16:27:19 +0000
Subject: [PATCH] Add 1280x960. This is the "native" resolution for 19" 4:3
 CRTs.

---
 src/client/menu/videomenu.c |  1 +
 src/unix/vid.c              | 15 ++++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/client/menu/videomenu.c b/src/client/menu/videomenu.c
index 916e8685..dc357e97 100644
--- a/src/client/menu/videomenu.c
+++ b/src/client/menu/videomenu.c
@@ -195,6 +195,7 @@ VID_MenuInit ( void )
 		"[1152 864 ]",
 		"[1280 800 ]",
 		"[1280 854 ]",
+		"[1280 960 ]",
 		"[1280 1024]",
 		"[1440 900 ]",
 		"[1600 1200]",
diff --git a/src/unix/vid.c b/src/unix/vid.c
index 6e550bb7..f7f56887 100644
--- a/src/unix/vid.c
+++ b/src/unix/vid.c
@@ -145,13 +145,14 @@ vidmode_t vid_modes[] = {
 	{ "Mode 12: 1152x864", 1152, 864,  12 },
 	{ "Mode 13: 1280x800", 1280,  800, 13 },
 	{ "Mode 14: 1280x854", 1280,  854, 14 },
-	{ "Mode 15: 1280x1024", 1280, 1024, 15 },
-	{ "Mode 16: 1440x900",	1440, 900,	17 },
-	{ "Mode 17: 1600x1200", 1600, 1200, 17 },
-	{ "Mode 18: 1680x1050", 1680, 1050, 18 },
-	{ "Mode 19: 1920x1080",	1920, 1080, 19 },
-	{ "Mode 20: 1920x1200", 1920, 1200, 20 },
-	{ "Mode 21: 2048x1536", 2048, 1536, 21 },
+	{ "Mode 15: 1280x960", 1280,  860, 15 },
+	{ "Mode 16: 1280x1024", 1280, 1024, 16 },
+	{ "Mode 17: 1440x900",	1440, 900,	17 },
+	{ "Mode 18: 1600x1200", 1600, 1200, 18 },
+	{ "Mode 19: 1680x1050", 1680, 1050, 19 },
+	{ "Mode 20: 1920x1080",	1920, 1080, 20 },
+	{ "Mode 21: 1920x1200", 1920, 1200, 21 },
+	{ "Mode 22: 2048x1536", 2048, 1536, 22 },
 };
 
 qboolean