From 76011715e758f88033b3aea6a32ea4eb4f55ba27 Mon Sep 17 00:00:00 2001
From: Ykkrosh <philip@wildfiregames.com>
Date: Fri, 26 Mar 2010 11:40:17 +0000
Subject: [PATCH] Point at the new local.cfg locations

This was SVN commit r7399.
---
 binaries/data/config/default.cfg | 39 +++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 16 deletions(-)

diff --git a/binaries/data/config/default.cfg b/binaries/data/config/default.cfg
index 3d193507e3..cbc335c2b2 100644
--- a/binaries/data/config/default.cfg
+++ b/binaries/data/config/default.cfg
@@ -2,25 +2,36 @@
 ;
 ; **************************************************************
 ; * DO NOT EDIT THIS FILE if you want personal customisations: *
-; * create a file called "local.cfg" instead, and copy into    *
-; * it the lines from this file that you want to change.       *
+; * create a text file called "local.cfg" instead, and copy    *
+; * the lines from this file that you want to change.          *
+; *                                                            *
+; * On Linux / OS X, create:                                   *
+; *   ~/.config/0ad/config/local.cfg                           *
+; *                                                            *
+; * On Windows, create:                                        *
+; *   %appdata%/0ad/config/local.cfg                           *
+; *                                                            *
 ; **************************************************************
 
-; Profile selection
+; Enable/disable windowed mode.
+windowed = true
 
-profile = default
+; Force a particular resolution. (If these are unspecified, the
+; default is keeping the current desktop resolution.)
+xres = 1024
+yres = 768
 
 ; System settings:
 
+fancywater = true
+shadows = true
+vsync = false
+
 nos3tc = false
 noautomipmap = false
 novbo = false
 noframebufferobject = false
 
-shadows = true
-vsync = false
-fancywater = true
-
 ; Specify the render path. This can be one of:
 ;   default       Automatically select one of the below, depending on system capabilities
 ;   fixed         Only use OpenGL fixed function pipeline
@@ -34,17 +45,13 @@ renderpath = default
 ; -1.0 to -1.5 recommended for good results.
 lodbias = -0.5
 
+; Profile selection
+
+profile = default
+
 ; Language selection: (currently "english" or "pseudogreek")
 language = english
 
-; Enable/disable windowed mode.
-windowed = true
-
-; You can specify these as well, but the default (keeping the current resolution) is
-; probably best for most people.
-xres = 1024
-yres = 768
-
 ; Font mappings:
 
 font.console = console