[turner] 23607: merge r23606

Author: turner
Date: Sat Aug 19 03:49:46 2006
New Revision: 23607

URL: http://svn.reactos.org/svn/reactos?rev=23607&view=rev
Log:
merge r23606

Modified:
    branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff

Modified: branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff
URL:
http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_0/reactos/boot/b…
==============================================================================
--- branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff (original)
+++ branches/ros-branch-0_3_0/reactos/boot/bootdata/packages/reactos.dff Sat Aug 19
03:49:46 2006
@@ -31,6 +31,8 @@
 ; Base files
 base\applications\cacls\cacls.exe                   1
 base\applications\calc\calc.exe                     1
+base\applications\cmdutils\find\find.exe            1
+base\applications\cmdutils\more\more.exe            1
 base\applications\control\control.exe               1
 base\applications\devmgr\devmgrapp.exe              1
 base\applications\games\solitaire\sol.exe           1
@@ -57,9 +59,11 @@
 ;base\applications\reporterror\reporterror.exe      1
 base\applications\sc\sc.exe                         1
 base\applications\screenshot\screenshot.exe         1
+base\applications\screensavers\matrix\matrix.scr    1
 base\applications\servman\servman.exe               1
 base\applications\shutdown\shutdown.exe             1
-;base\applications\sm\sm.exe                        1
+base\applications\sm\sm.exe                         1
+base\applications\sndvol32\sndvol32.exe             1
 base\applications\taskmgr\taskmgr.exe               1
 ;base\applications\utils\rosperf\rosperf.exe        1
 ;base\applications\utils\ps\ps.exe                  1
@@ -106,6 +110,7 @@
 dll\cpl\main\main.cpl                               1
 dll\cpl\mmsys\mmsys.cpl                             1
 dll\cpl\ncpa\ncpa.cpl                               1
+dll\cpl\powercfg\powercfg.cpl                       1
 dll\cpl\sysdm\sysdm.cpl                             1
 dll\cpl\timedate\timedate.cpl                       1
 
@@ -149,6 +154,7 @@
 dll\win32\comdlg32\comdlg32.dll                     1
 dll\win32\crtdll\crtdll.dll                         1
 dll\win32\crypt32\crypt32.dll                       1
+dll\win32\cryptdll\cryptdll.dll                     1
 dll\win32\dbghelp\dbghelp.dll                       1
 dll\win32\devmgr\devmgr.dll                         1
 dll\win32\dhcpcsvc\dhcpcsvc.dll                     1
@@ -164,7 +170,7 @@
 dll\win32\iphlpapi\iphlpapi.dll                     1
 dll\win32\kernel32\kernel32.dll                     1
 dll\win32\lsasrv\lsasrv.dll                         1
-dll\win32\lzexpand\lz32.dll                         1
+dll\win32\lz32\lz32.dll                             1
 dll\win32\mapi32\mapi32.dll                         1
 dll\win32\winmm\midimap\midimap.dll                 1
 dll\win32\mmdrv\mmdrv.dll                           1
@@ -190,8 +196,9 @@
 dll\win32\olepro32\olepro32.dll                     1
 dll\win32\opengl32\opengl32.dll                     1
 dll\win32\psapi\psapi.dll                           1
+dll\win32\powrprof\powrprof.dll                     1
 dll\win32\riched20\riched20.dll                     1
-dll\win32\richedit\riched32.dll                     1
+dll\win32\riched32\riched32.dll                     1
 dll\win32\rpcrt4\rpcrt4.dll                         1
 dll\win32\samlib\samlib.dll                         1
 dll\win32\samsrv\samsrv.dll                         1
@@ -204,7 +211,7 @@
 dll\win32\shlwapi\shlwapi.dll                       1
 dll\win32\smdll\smdll.dll                           1
 dll\win32\syssetup\syssetup.dll                     1
-dll\win32\twain\twain_32.dll                        1
+dll\win32\twain_32\twain_32.dll                     1
 dll\win32\urlmon\urlmon.dll                         1
 dll\win32\user32\user32.dll                         1
 dll\win32\userenv\userenv.dll                       1
@@ -264,6 +271,26 @@
 drivers\video\videoprt\videoprt.sys                 2
 
 ; Media
+media\fonts\DejaVuSans.ttf                          3
+media\fonts\DejaVuSans-Bold.ttf                     3    
+media\fonts\DejaVuSans-BoldOblique.ttf              3  
+media\fonts\DejaVuSansCondensed.ttf                 3
+media\fonts\DejaVuSansCondensed-Bold.ttf            3
+media\fonts\DejaVuSansCondensed-Oblique.ttf         3
+media\fonts\DejaVuSans-ExtraLight.ttf               3
+media\fonts\DejaVuSansMono.ttf                      3
+media\fonts\DejaVuSansMono-Bold.ttf                 3
+media\fonts\DejaVuSansMono-BoldOblique.ttf          3
+media\fonts\DejaVuSansMono-Oblique.ttf              3
+media\fonts\DejaVuSans-Oblique.ttf                  3  
+media\fonts\DejaVuSerif.ttf                         3
+media\fonts\DejaVuSerif-Bold.ttf                    3
+media\fonts\DejaVuSerif-BoldOblique.ttf             3
+media\fonts\DejaVuSerifCondensed.ttf                3
+media\fonts\DejaVuSerifCondensed-Bold.ttf           3
+media\fonts\DejaVuSerifCondensed-BoldOblique.ttf    3 
+media\fonts\DejaVuSerifCondensed-Oblique.ttf        3 
+media\fonts\DejaVuSerif-Oblique.ttf                 3
 media\fonts\c0419bt_.ttf                            3
 media\fonts\c0582bt_.ttf                            3
 media\fonts\c0583bt_.ttf                            3
@@ -360,6 +387,7 @@
 media\inf\scsi.inf                                  6
 media\inf\syssetup.inf                              6
 media\inf\usbport.inf                               6
+media\inf\usb.inf                                   6
 media\inf\usbstor.inf                               6
 media\inf\xboxdisp.inf                              6
 
@@ -385,9 +413,7 @@
 modules\vms\server\vmssrv.dll                       1   optional
 modules\vms\dll\win32\vmsdll\vmsdll.dll             1   optional
 modules\rosapps\cmdutils\comp\comp.exe              1   optional
-modules\rosapps\cmdutils\find\find.exe              1   optional
 modules\rosapps\cmdutils\mode\mode.exe              1   optional
-modules\rosapps\cmdutils\more\more.exe              1   optional
 modules\rosapps\cmdutils\sort\sort.exe              1   optional
 modules\rosapps\cmdutils\tee\tee.exe                1   optional
 modules\rosapps\cmdutils\touch\touch.exe            1   optional