[ja-cvs] CVS update: /ja/www/

[foral]

User: foral   
Date: 05/07/17 23:04:55

Modified:
 /ja/www/
  index.html

Log:
 marge

File Changes:

Directory: /ja/www/
===================

File [changed]: index.html
Url: http://ja.openoffice.org/source/browse/ja/www/index.html?r1=1.299&r2=1.300
Delta lines:  +2 -4
-------------------
--- index.html  18 Jul 2005 05:27:04 -0000      1.299
+++ index.html  18 Jul 2005 06:04:52 -0000      1.300
@@ -85,7 +85,6 @@
       <p>2005/3/18:<a 
href="./marketing/pressrelease/20050319.txt">OpenOffice.org2.0日本語版ベータをリリースしました</a>,

       <a href="download/2.0beta/">OpenOffice.org2.0ベータ版ページ</a>

       </p>

->>>>>>> 1.290

       <p align="right"><a href="marketing/pressrelease/index.html">

       <img src="./images/marker.png" height="17" 
width="11">前のニュースも見てみる</a></p>

       </td>

@@ -136,12 +135,11 @@
       <td class="menu-item" align="right" nowrap="nowrap" valign="middle">

       <a 
href="http://dmoz.org/World/Japanese/%e3%82%b3%e3%83%b3%e3%83%94%e3%83%a5%e3%83%bc%e3%82%bf/%e3%82%bd%e3%83%95%e3%83%88%e3%82%a6%e3%82%a7%e3%82%a2/%e3%82%aa%e3%83%95%e3%82%a3%e3%82%b9%e3%82%b9%e3%82%a4%e3%83%bc%e3%83%88/OpenOffice.org/";>

       <img src="./images/marker.png" height="17" 
width="11">OpenOffice.orgリンク集(dmoz)</a></td>

->>>>>>> 1.290

     </tr>

     <tr>

       <td class="menu-item" align="right" nowrap="nowrap" valign="middle"><a 
href="http://openoffice.s16.xrea.com:8080/pukiwiki/pukiwiki.php?%5B%5BOOo%A5%AA%A1%BC%A5%D7%A5%F3%A5%DE%A5%CB%A5%E5%A5%A2%A5%EB%5D%5D";><img
 src="images/marker.png" height="17" 
width="11">OpenOffice.orgマニュアル</a></td>

       <td class="menu-item" align="right" nowrap="nowrap" valign="middle"><a 
href="http://oooug.jp/compati/";>

-      <img src="images/marker.png" height="17" 
width="11">MicrosoftOffice互換性研究室</a></td>>>>>>>> 1.289

+      <img src="images/marker.png" height="17" 
width="11">MicrosoftOffice互換性研究室</a></td>

     </tr>

   </tbody>

 </table>

@@ -356,7 +354,7 @@
 <div 
id="writers-and-designers">作者:七海健太郎・Y・小浦寛裕・catch<br>

 デザイン:七海健太郎</div>

 <div id="html-page-id">

-$Id: index.html,v 1.299 2005/07/18 05:27:04 foral Exp $

+$Id: index.html,v 1.300 2005/07/18 06:04:52 foral Exp $

 </div>

 </body>

 </html>





---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]