Author: rjek Date: Mon Aug 13 12:39:22 2007 New Revision: 3513 URL: http://source.netsurf-browser.org?rev=3513&view=rev Log: Merged revisions 3512 via svnmerge from svn://svn.netsurf-browser.org/trunk/netsurf ........ r3512 | bursa | 2007-08-13 12:36:25 +0100 (Mon, 13 Aug 2007) | 1 line Rename default scale option back to "scale" (changed to "option_scale" by mistake). ........ Modified: branches/1/netsurf/ (props changed) branches/1/netsurf/desktop/options.c Propchange: branches/1/netsurf/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Mon Aug 13 12:39:22 2007 @@ -1,1 +1,1 @@ -/trunk/netsurf:1-3295,3299,3301-3337,3345-3382,3384-3404,3408-3419,3421-3426,3428-3431,3434,3437,3439-3440,3442-3447,3449-3476,3478,3480-3481,3483-3484,3486,3493-3495,3498,3507-3508,3510 +/trunk/netsurf:1-3295,3299,3301-3337,3345-3382,3384-3404,3408-3419,3421-3426,3428-3431,3434,3437,3439-3440,3442-3447,3449-3476,3478,3480-3481,3483-3484,3486,3493-3495,3498,3507-3508,3510,3512 Modified: branches/1/netsurf/desktop/options.c URL: http://source.netsurf-browser.org/branches/1/netsurf/desktop/options.c?re... ============================================================================== --- branches/1/netsurf/desktop/options.c (original) +++ branches/1/netsurf/desktop/options.c Mon Aug 13 12:39:22 2007 @@ -191,7 +191,7 @@ { "window_screen_width", OPTION_INTEGER, &option_window_screen_width }, { "window_screen_height",OPTION_INTEGER, &option_window_screen_height }, { "toolbar_status_size", OPTION_INTEGER, &option_toolbar_status_width }, - { "option_scale", OPTION_INTEGER, &option_scale }, + { "scale", OPTION_INTEGER, &option_scale }, /* Fetcher options */ { "max_fetchers", OPTION_INTEGER, &option_max_fetchers }, { "max_fetchers_per_host",