merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.

added backup feature

Fixed problems caused my copyright adding tool.
Broadend copyright stuff

started on integrated help

added lock

added hex support for int in XML
added OE solutions XML file