summaryrefslogtreecommitdiff
path: root/sc/source/ui/miscdlgs/conflictsdlg.src
AgeCommit message (Expand)AuthorFilesLines
2012-01-28replace obsolete "master" branch with README that points at new repoHEADmaster-deletedmasterMichael Stahl1-112/+0
2011-03-10Merge commit 'ooo/DEV300_m101' into integration/dev300_m101Kohei Yoshida1-0/+4
2010-11-21.src cleanup and .png fixesJoseph Powers1-4/+3
2010-10-11CWS changehid: generate former auto hids into src filesMathias Bauer1-0/+4
2010-02-12changefileheader2: #i109125#: change source file copyright notice from Sun Mi...Jens-Heiner Rechtien1-4/+1
2008-07-31INTEGRATION: CWS dr65 (1.3.120); FILE MERGEDRĂ¼diger Timm1-14/+14
2008-04-10INTEGRATION: CWS changefileheader (1.2.34); FILE MERGEDRĂ¼diger Timm1-24/+19
2008-03-07INTEGRATION: CWS calcshare_DEV300 (1.1.2); FILE ADDEDKurt Zenker1-0/+117