[ros-diffs] [cfinck] 41731: Merge 41694, 41702, 41715, 41729

cfinck at svn.reactos.org cfinck at svn.reactos.org
Wed Jul 1 23:01:12 CEST 2009


Author: cfinck
Date: Thu Jul  2 01:01:11 2009
New Revision: 41731

URL: http://svn.reactos.org/svn/reactos?rev=41731&view=rev
Log:
Merge 41694, 41702, 41715, 41729

Modified:
    branches/ros-branch-0_3_10/reactos/   (props changed)
    branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml
    branches/ros-branch-0_3_10/reactos/modules/directory.rbuild
    branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h   (contents, props changed)
    branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c   (props changed)
    branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h   (props changed)
    branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak   (props changed)
    branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c   (props changed)

Propchange: branches/ros-branch-0_3_10/reactos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 01:01:11 2009
@@ -1,1 +1,1 @@
-/trunk/reactos:41447,41526,41666,41676,41684
+/trunk/reactos:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729

Modified: branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml?rev=41731&r1=41730&r2=41731&view=diff
==============================================================================
--- branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] (original)
+++ branches/ros-branch-0_3_10/reactos/base/applications/downloader/downloader.xml [iso-8859-1] Thu Jul  2 01:01:11 2009
@@ -8,11 +8,11 @@
 			<location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/2.0.0.20/win32/en-US/Firefox%20Setup%202.0.0.20.exe</location>
 		</application>
 		<application name="Firefox 3.0">
-			<regname>Mozilla Firefox (3.0.9)</regname>
+			<regname>Mozilla Firefox (3.0.11)</regname>
 			<licence>MPL/GPL/LGPL</licence>
-			<version>3.0.9</version>
+			<version>3.0.11</version>
 			<description>The most popular and one of the best free Web Browsers out there.</description>
-			<location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.9/win32/en-US/Firefox%20Setup%203.0.9.exe</location>
+			<location>http://releases.mozilla.org/pub/mozilla.org/firefox/releases/3.0.11/win32/en-US/Firefox%20Setup%203.0.11.exe</location>
 		</application>
 		<application name="Opera">
 			<regname>Opera</regname>
@@ -21,6 +21,13 @@
 			<description>The popular Opera Browser with many advanced features and including a Mail and BitTorrent client.</description>
 			<location>http://ftp.opera.com/pub/opera/win/963/en/Opera_963_classic_Setup.exe</location>
 		</application>
+		<application name="Abyss Web server X1 2.6">
+			<regname>AbyssX1 2.6</regname>
+			<licence>Freeware</licence>
+			<version>2.6</version>
+			<description>Abyss Web Server enables you to host your Web sites on your computer. It supports secure SSL/TLS connections (HTTPS) as well as a wide range of Web technologies. It can also run advanced PHP, Perl, Python, ASP, ASP.NET, and Ruby on Rails Web applications, which can be backed by databases such as MySQL, SQLite, MS SQL Server, MS Access, or Oracle</description>
+			<location>http://www.aprelium.com/data/abwsx1.exe</location>
+		</application>
 		<application name="Thunderbird 2.0">
 			<regname>Mozilla Thunderbird (2.0.0.19)</regname>
 			<licence>MPL/GPL/LGPL</licence>
@@ -71,6 +78,20 @@
 			<description>Word processor.</description>
 			<location>http://www.abiword.org/downloads/abiword/2.6.4/Windows/abiword-setup-2.6.4.exe</location>
 		</application>
+		<application name="SoftMaker Office 2008">
+			<regname>SoftMakerOff08</regname>
+			<version>2008</version>
+			<licence>Shareware</licence>
+			<description>SoftMaker Office 2008 comes with the following applications: TextMaker 2008: Reads and writes all Microsoft Word files without a hitch. PlanMaker 2008, the fully Excel-compatible spreadsheet. SoftMaker Presentations 2008, fully compatible with Microsoft PowerPoint.</description>
+			<location>http://www.softmaker.net/down/ofw08ev.exe</location>
+		</application>
+		<application name="TextMaker Viewer 2009">
+			<regname>TextMaker Viewer 2009</regname>
+			<version>TMViewer09</version>
+			<licence>Freeware</licence>
+			<description>A light viewer which lets you open, view, and print documents created with Microsoft Word 6.0 to 2007, TextMaker as well as OpenDocument and other common office file formats.</description>
+			<location>http://www.softmaker.net/down/TMViewerSetup.exe</location>
+		</application>
 		<application name="OpenOffice 2.4">
 			<regname>OpenOffice.org 2.4.2</regname>
 			<version>2.4.2</version>
@@ -122,42 +143,36 @@
 			<description>MFC 4 is needed by some applications</description>
 			<location>http://download.microsoft.com/download/ole/ole2v/3.5/w351/en-us/ole2v.exe</location>
 		</application>
-
 		<application name="Visual Basic 5 Runtime">
 			<regname>vb5run</regname>
 			<version>5.0</version>
 			<description>Visual Basic 5 Runtime</description>
 			<location>http://download.microsoft.com/download/vb50pro/utility/1/win98/en-us/msvbvm50.exe</location>
 		</application>
-
 		<application name="Visual Basic 6 Runtime">
 			<regname>vb6run</regname>
 			<version>6.0</version>
 			<description>Visual Basic 6 Runtime</description>
 			<location>http://download.microsoft.com/download/vb60pro/install/6/win98me/en-us/vbrun60.exe</location>
 		</application>
-
 		<application name="Visual Studio 6 Runtime">
 			<regname>vc6run</regname>
 			<version>6.0</version>
 			<description>Visual Studio 6 Runtime</description>
 			<location>http://download.microsoft.com/download/vc60pro/update/1/w9xnt4/en-us/vc6redistsetup_enu.exe</location>
 		</application>
-
 		<application name="Visual Studio 2005 Runtime">
 			<regname>vc2005run</regname>
 			<version>7.0</version>
 			<description>Visual Studio 2005 Runtime</description>
 			<location>http://download.microsoft.com/download/d/3/4/d342efa6-3266-4157-a2ec-5174867be706/vcredist_x86.exe</location>
 		</application>
-
 		<application name="Visual Studio 2005 Runtime SP1">
 			<regname>vc2005sp1run</regname>
 			<version>7.1</version>
 			<description>Visual Studio 2005 Runtime SP1</description>
 			<location>http://download.microsoft.com/download/e/1/c/e1c773de-73ba-494a-a5ba-f24906ecf088/vcredist_x86.exe</location>
 		</application>
-
 		<application name="Visual Studio 2008 Runtime">
 			<regname>vc2008run</regname>
 			<version>8.0</version>
@@ -172,19 +187,33 @@
 			<description>SMPlayer</description>
 			<location>http://dfn.dl.sourceforge.net/sourceforge/smplayer/smplayer_0.6.7_setup.exe</location>
 		</application>
+		<application name="VLC Media Player 0.8.0">
+			<regname>vlc0.8.0</regname>
+			<licence>GPL</licence>
+			<version>0.8.0</version>
+			<description>VLC media player is a highly portable multimedia player for various audio and video formats (MPEG-1, MPEG-2, MPEG-4, DivX, mp3, ogg, ...) as well as DVDs, VCDs, and various streaming protocols.</description>
+			<location>http://download.videolan.org/pub/videolan/vlc/0.8.0/win32/vlc-0.8.0-win32.exe</location>
+		</application>
 	</category>
 	<category name="Development" icon="5">
 		<application name="ReactOS Build Environment">
-			<regname>ReactOS Build Environment 1.2</regname>
-			<version>1.2</version>
+			<regname>ReactOS Build Environment 1.4.4</regname>
+			<version>1.4.4</version>
 			<description>Allows you to build the ReactOS Source. For more instructions see ReactOS wiki.</description>
-			<location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.2.exe</location>
+			<location>http://ovh.dl.sourceforge.net/sourceforge/reactos/RosBE-1.4.4.exe</location>
 		</application>
 		<application name="MinGW">
 			<regname>MinGW 5.1.3</regname>
 			<version>5.1.3</version>
 			<description>A Port of the GNU toolchain with GCC, GDB, GNU make, etc.</description>
 			<location>http://ovh.dl.sourceforge.net/sourceforge/mingw/MinGW-5.1.3.exe</location>
+		</application>
+		<application name="SciTE 1.78">
+			<regname>SciTE 1.78</regname>
+			<version>1.78</version>
+			<licence>GPL</licence>
+			<description>SciTE is a SCIntilla based Text Editor. Originally built to demonstrate Scintilla, it has grown to be a generally useful editor with facilities for building and running programs.</description>
+			<location>http://fastbull.dl.sourceforge.net/sourceforge/scintilla/Sc178.exe</location>
 		</application>
 		<application name="FreeBASIC">
 			<regname>FreeBASIC 0.18.4b</regname>

Modified: branches/ros-branch-0_3_10/reactos/modules/directory.rbuild
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/modules/directory.rbuild?rev=41731&r1=41730&r2=41731&view=diff
==============================================================================
--- branches/ros-branch-0_3_10/reactos/modules/directory.rbuild [iso-8859-1] (original)
+++ branches/ros-branch-0_3_10/reactos/modules/directory.rbuild [iso-8859-1] Thu Jul  2 01:01:11 2009
@@ -22,11 +22,4 @@
 			</xi:fallback>
 		</xi:include>
 	</directory>
-	<directory name="windows">
-		<xi:include href="windows/directory.rbuild">
-			<xi:fallback>
-				<xi:include href="empty.rbuild" />
-			</xi:fallback>
-		</xi:include>
-	</directory>
 </group>

Modified: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h
URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h?rev=41731&r1=41730&r2=41731&view=diff
==============================================================================
--- branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] (original)
+++ branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h [iso-8859-1] Thu Jul  2 01:01:11 2009
@@ -16,8 +16,7 @@
  *  along with this program; if not, write to the Free Software
  *  Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
-/* $Id$
- *
+ /*
  * COPYRIGHT:         See COPYING in the top level directory
  * PROJECT:           ReactOS kernel
  * PURPOSE:           GDI Internal Objects

Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Propchange: branches/ros-branch-0_3_10/reactos/subsystems/win32/win32k/include/engobjects.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 01:01:11 2009
@@ -1,2 +1,2 @@
 /branches/ros-amd64-bringup/reactos/subsystems/win32/win32k/include/engobjects.h:40095
-/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666,41676,41684
+/trunk/reactos/subsystems/win32/win32k/include/engobjects.h:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-author date id revision

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 01:01:11 2009
@@ -1,2 +1,2 @@
 /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666,41676,41684
+/trunk/reactos/tools/rsym/rsym.c:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-Author Date Id Revision

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.h
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 01:01:11 2009
@@ -1,2 +1,2 @@
 /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.h:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666,41676,41684
+/trunk/reactos/tools/rsym/rsym.h:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym.mak
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 01:01:11 2009
@@ -1,2 +1,2 @@
 /branches/ros-amd64-bringup/reactos/tools/rsym/rsym.mak:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666,41676,41684
+/trunk/reactos/tools/rsym/rsym.mak:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:keywords (original)
+++ svn:keywords (removed)
@@ -1,1 +1,0 @@
-Author Date Id Revision

Propchange: branches/ros-branch-0_3_10/reactos/tools/rsym/rsym_common.c
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jul  2 01:01:11 2009
@@ -1,2 +1,2 @@
 /branches/ros-amd64-bringup/reactos/tools/rsym/rsym_common.c:37291,37302,37305,37320,37329,37462,37895,38129,38330-38331,38341,38947,38973,39072,39114,39121,40605
-/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666,41676,41684
+/trunk/reactos/tools/rsym/rsym_common.c:41447,41526,41666,41676,41684,41694-41695,41702,41715,41729



More information about the Ros-diffs mailing list