diff options
| author | Michael Meeks <michael.meeks@novell.com> | 2011-03-04 21:07:09 +0000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@novell.com> | 2011-03-04 21:07:09 +0000 |
| commit | fb2038e67257fb410f96bfa0ef6302275696c688 (patch) | |
| tree | 9d77d8aa7ecc6dce4f2b98eba5ddcde85248ec5c /dbaccess/source/ui/dlg/odbcconfig.hxx | |
| parent | 67e031ea1933a566b4c9bd3d5f2947a7fffdea24 (diff) | |
fix misc merge issues
Diffstat (limited to 'dbaccess/source/ui/dlg/odbcconfig.hxx')
0 files changed, 0 insertions, 0 deletions