summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs/conflictsdlg.src
AgeCommit message (Expand)Author
2012-06-21re-base on ALv2 code.Michael Meeks
2011-03-10Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Kohei Yoshida
2010-11-21.src cleanup and .png fixesJoseph Powers
2010-10-11CWS changehid: generate former auto hids into src filesMathias Bauer
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien
2008-07-31INTEGRATION: CWS dr65 (1.3.120); FILE MERGEDRüdiger Timm
2008-04-10INTEGRATION: CWS changefileheader (1.2.34); FILE MERGEDRüdiger Timm
2008-03-07INTEGRATION: CWS calcshare_DEV300 (1.1.2); FILE ADDEDKurt Zenker