bb62daae1c
Conflicts: codestyles/Default.xml colors/Cobalt copy.icls filetypes.xml find.xml scratches.xml ui.lnf.xml |
||
---|---|---|
.. | ||
Default _1_.icls | ||
Default _1_.xml | ||
Default _2_.xml | ||
Default.xml | ||
Martins Style.icls | ||
Martins Style.xml |