Some order made in defines for dictionary types - hardcoded values changed
to def-s, unused defs commented, potential dictionary type conflict resolved
Authored by: gyver309 2006-12-28
Parent: [r9060]
Child: [r9062]
