[ros-diffs] [cfinck] 40233: Merge 40224-40232

[cfinck at svn.reactos.org]

Author: cfinck
Date: Wed Mar 25 19:36:43 2009
New Revision: 40233

URL: http://svn.reactos.org/svn/reactos?rev=40233&view=rev
Log:
Merge 40224-40232

Modified:
    branches/danny-web/reactos.org/htdocs/   (props changed)
    branches/danny-web/reactos.org/htdocs/getbuilds/index.php
    branches/danny-web/reactos.org/htdocs/shared/css/menu.css   (props changed)
    branches/danny-web/reactos.org/htdocs/shared/images/ajax_loading.gif   (props changed)
    branches/danny-web/reactos.org/htdocs/shared/images/info.gif   (props changed)
    branches/danny-web/reactos.org/htdocs/shared/images/ll.gif   (props changed)
    branches/danny-web/reactos.org/htdocs/shared/images/lr.gif   (props changed)
    branches/danny-web/reactos.org/htdocs/shared/images/ul.gif   (props changed)
    branches/danny-web/reactos.org/htdocs/shared/images/ur.gif   (props changed)

Propchange: branches/danny-web/reactos.org/htdocs/
------------------------------------------------------------------------------
    svn:mergeinfo = /trunk/web/reactos.org/htdocs:37590-40163,40224-40232

Modified: branches/danny-web/reactos.org/htdocs/getbuilds/index.php
URL: http://svn.reactos.org/svn/reactos/branches/danny-web/reactos.org/htdocs/getbuilds/index.php?rev=40233&r1=40232&r2=40233&view=diff
==============================================================================
--- branches/danny-web/reactos.org/htdocs/getbuilds/index.php [iso-8859-1] (original)
+++ branches/danny-web/reactos.org/htdocs/getbuilds/index.php [iso-8859-1] Wed Mar 25 19:36:43 2009
@@ -68,7 +68,7 @@
 		
 		<?php echo $getbuilds_langres["buildbot_status"]; ?>:
 		<ul class="web">
-			<li><a href="http://www.reactos.org:8010"><?php echo $getbuilds_langres["buildbot_web"]; ?></a></li>
+			<li><a href="http://build.reactos.org:8010"><?php echo $getbuilds_langres["buildbot_web"]; ?></a></li>
 			<li><a href="<?php echo $ISO_DOWNLOAD_URL; ?>"><?php echo $getbuilds_langres["browsebuilds"]; ?></a></li>
 		</ul>
 	</div>

Propchange: branches/danny-web/reactos.org/htdocs/shared/css/menu.css
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/css/menu.css:40224-40232

Propchange: branches/danny-web/reactos.org/htdocs/shared/images/ajax_loading.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/images/ajax_loading.gif:40224-40232

Propchange: branches/danny-web/reactos.org/htdocs/shared/images/info.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/images/info.gif:40224-40232

Propchange: branches/danny-web/reactos.org/htdocs/shared/images/ll.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/images/ll.gif:40224-40232

Propchange: branches/danny-web/reactos.org/htdocs/shared/images/lr.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/images/lr.gif:40224-40232

Propchange: branches/danny-web/reactos.org/htdocs/shared/images/ul.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/images/ul.gif:40224-40232

Propchange: branches/danny-web/reactos.org/htdocs/shared/images/ur.gif
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Mar 25 19:36:43 2009
@@ -1,0 +1,1 @@
+/trunk/web/reactos.org/htdocs/shared/images/ur.gif:40224-40232