diff options
| author | Noel Power <noel.power@novell.com> | 2010-10-13 10:17:11 +0100 |
|---|---|---|
| committer | Noel Power <noel.power@novell.com> | 2010-10-13 10:17:11 +0100 |
| commit | ecf31cd7b1a8f623c644566710af1443e092e43d (patch) | |
| tree | 85d080c9bff50e0097e68aa35c3dc45861297383 /xmlsecurity/source/xmlsec/nss/nssrenam.h | |
| parent | ba23e2ddcff997af2e1575acd243d42c6375566b (diff) | |
| parent | b3c30660b2a2c4d93f99d0b22ae192d928a23005 (diff) | |
Merge branch 'vba' fix conflics ( below ), trailing ws and leading tabs
Conflicts:
forms/source/component/RadioButton.cxx
forms/source/inc/property.hrc
Diffstat (limited to 'xmlsecurity/source/xmlsec/nss/nssrenam.h')
0 files changed, 0 insertions, 0 deletions