Author: zguo Date: Wed Feb 1 04:58:00 2012 New Revision: 55363
URL: http://svn.reactos.org/svn/reactos?rev=55363&view=rev Log: Merge r55012 adding Wine3D control panel as per Amine's request.
Added: branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/ (props changed) - copied from r55012, trunk/reactos/dll/cpl/wined3dcfg/ Modified: branches/ros-branch-0_3_14/ (props changed) branches/ros-branch-0_3_14/dll/cpl/ (props changed) branches/ros-branch-0_3_14/dll/cpl/CMakeLists.txt branches/ros-branch-0_3_14/dll/cpl/cpl.rbuild branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/lang/ (props changed) branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/resources/ (props changed)
Propchange: branches/ros-branch-0_3_14/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Feb 1 04:58:00 2012 @@ -11,3 +11,4 @@ /branches/shell32_new-bringup:51893-53652,53661,53700 /branches/tcp-rewrite-branch:48720,48840-48841,49424-49426,49454 /branches/wlan-bringup:54809-54998 +/trunk/reactos:55012
Propchange: branches/ros-branch-0_3_14/dll/cpl/ ------------------------------------------------------------------------------ --- svn:ignore (original) +++ svn:ignore Wed Feb 1 04:58:00 2012 @@ -1,7 +1,8 @@ -GNUmakefile -*.vcproj -*.user *.cbp *.ncb +*.sln *.suo -*.sln +*.user +*.vcproj +GNUmakefile +wined3dcfg
Modified: branches/ros-branch-0_3_14/dll/cpl/CMakeLists.txt URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/dll/cpl/CMakeL... ============================================================================== --- branches/ros-branch-0_3_14/dll/cpl/CMakeLists.txt [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/dll/cpl/CMakeLists.txt [iso-8859-1] Wed Feb 1 04:58:00 2012 @@ -18,3 +18,4 @@ add_subdirectory(telephon) add_subdirectory(timedate) add_subdirectory(usrmgr) +add_subdirectory(wined3dcfg)
Modified: branches/ros-branch-0_3_14/dll/cpl/cpl.rbuild URL: http://svn.reactos.org/svn/reactos/branches/ros-branch-0_3_14/dll/cpl/cpl.rb... ============================================================================== --- branches/ros-branch-0_3_14/dll/cpl/cpl.rbuild [iso-8859-1] (original) +++ branches/ros-branch-0_3_14/dll/cpl/cpl.rbuild [iso-8859-1] Wed Feb 1 04:58:00 2012 @@ -55,4 +55,7 @@ <directory name="usrmgr"> <xi:include href="usrmgr/usrmgr.rbuild" /> </directory> +<directory name="wined3dcfg"> + <xi:include href="wined3dcfg/wined3dcfg.rbuild" /> +</directory> </group>
Propchange: branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ --- bugtraq:logregex (added) +++ bugtraq:logregex Wed Feb 1 04:58:00 2012 @@ -1,0 +1,2 @@ +([Ii]ssue|[Bb]ug)s? #?(\d+)(,? ?#?(\d+))*(,? ?(and |or )?#?(\d+))? +(\d+)
Propchange: branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ bugtraq:message = See issue #%BUGID% for more details.
Propchange: branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ bugtraq:url = http://www.reactos.org/bugzilla/show_bug.cgi?id=%BUGID%
Propchange: branches/ros-branch-0_3_14/dll/cpl/wined3dcfg/ ------------------------------------------------------------------------------ tsvn:logminsize = 10