From: Laurent Destailleur Date: Wed, 20 Nov 2013 11:20:49 +0000 (+0100) Subject: Merge branch 'develop' of ssh://eldy@git.code.sf.net/p/awstats/code into develop X-Git-Tag: AWSTATS_7_3~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8d6d762cf1d1eb01e07486d3f79ba9bda3b491df;p=thirdparty%2FAWStats.git Merge branch 'develop' of ssh://eldy@git.code.sf.net/p/awstats/code into develop --- 8d6d762cf1d1eb01e07486d3f79ba9bda3b491df diff --cc wwwroot/cgi-bin/lib/operating_systems.pm index 02c32e3f,8837e781..c8f7a553 --- a/wwwroot/cgi-bin/lib/operating_systems.pm +++ b/wwwroot/cgi-bin/lib/operating_systems.pm @@@ -355,4 -351,4 +354,4 @@@ # OEM Service Release 2.5 4.03.1214* (4.00.950C) 8/24/96-11/18/97 # Windows 98 retail, OEM 4.10.1998 5/11/98 # Windows 98 Second Edition 4.10.2222A 4/23/99 --# Windows Me 4.90.3000 ++# Windows Me 4.90.3000