Index: xwiki/web/standard/src/main/webapp/skins/albatross/black-textareabg-disabled.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream

Property changes on: xwiki\web\standard\src\main\webapp\skins\albatross\black-textareabg-disabled.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Index: xwiki/web/standard/src/main/webapp/skins/albatross/colorsblack.css
===================================================================
--- xwiki/web/standard/src/main/webapp/skins/albatross/colorsblack.css	(revision 3118)
+++ xwiki/web/standard/src/main/webapp/skins/albatross/colorsblack.css	(working copy)
@@ -609,12 +609,31 @@
   padding: 2px;
 }
 
+textarea[disabled] {
+  background-image: url("black-textareabg-disabled.png");
+  background-position: 0px 0px;
+  background-repeat: no-repeat;
+  background-color: #e4e4e4;
+  border: 1px solid #000;
+  padding: 2px;
+}
+
 input[type=text], input[type=password], input[type=checkbox], input[type=file], select{
   background: #e6eaee url("black-textareabg.png") 0px 0px no-repeat;
   border: 1px solid #000;
   padding: 2px;
 }
 
+input[disabled], select[disabled]  {
+  background: #e4e4e4 url("black-textareabg-disabled.png") 0px 0px no-repeat;
+  border: 1px solid #000;
+  padding: 2px;
+}
+
+input[type="radio"][disabled] {
+  background-image: none;
+}
+
 /*ie nescessite de passer par une classe ou un selecteur sinon il pose des problemes*/
 input.ie{
   background: #e6eaee url("black-textareabg.png") 0px 0px no-repeat;
Index: xwiki/web/standard/src/main/webapp/WEB-INF/version.properties
===================================================================
--- xwiki/web/standard/src/main/webapp/WEB-INF/version.properties	(revision 3118)
+++ xwiki/web/standard/src/main/webapp/WEB-INF/version.properties	(working copy)
@@ -1,2 +1,7 @@
+<<<<<<< .mine
+#Wed May 02 19:20:29 EEST 2007
+build.number=1701
+=======
 #Fri Apr 27 17:21:11 CEST 2007
 build.number=1704
+>>>>>>> .r3118