Hello Helge
Just FYI:

Takizawa-san found a conflict in my checkout of testautomation module.
> http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/
> OOo_DEV300_m47_testautomation.zip
> OOo_DEV300_m47_testautomation.tar.bz2
I checkout after "cws is ready" has been announced. It may have already
been fixed, though.

Just fyi.

> http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/
> OOo_DEV300_m47_testautomation.zip
> OOo_DEV300_m47_testautomation.tar.bz2
> 
> testautomation\global\win\tab_a_d.win
> <<<<<<< .working
> IconsInMenueAnzeigen svx:CheckBox:OFA_TP_VIEW:CB_MENU_ICONS
> =======
> UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
> UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
> IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
>>>>>>>> .merge-right.r270772




From: Makoto Takizawa <[email protected]>
Subject: [ja-qa] OOo_DEV300_m47_testautomation ファイル競合
Date: Tue, 12 May 2009 14:02:25 +0900

> 瀧澤です。
> 
> 下記のTesttool用ファイルに競合コメントが残っている様です。
> 
> http://ooopackages.good-day.net/pub/OpenOffice.org/qa/testautomation/
> OOo_DEV300_m47_testautomation.zip
> OOo_DEV300_m47_testautomation.tar.bz2
> 
> testautomation\global\win\tab_a_d.winファイル
> <<<<<<< .working
> IconsInMenueAnzeigen svx:CheckBox:OFA_TP_VIEW:CB_MENU_ICONS
> =======
> UseHardwareAcceleration svx:CheckBox:OFA_TP_VIEW:CB_USE_HARDACCELL
> UseAntiAliasing svx:CheckBox:OFA_TP_VIEW:CB_USE_ANTIALIASE
> IconsInMenueAnzeigen svx:ListBox:OFA_TP_VIEW:LB_MENU_ICONS
>>>>>>>> .merge-right.r270772
> 
> ご連絡までに
> 
> -- 
> Makoto Takizawa <[email protected]>
> 
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: [email protected]
> For additional commands, e-mail: [email protected]
> 
> 
> 
> 

---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to