Merge branch 'debian' into systemtest
authorMarkus Schulz <schulz@alpharesearch.de>
Sun, 21 Nov 2010 18:49:40 +0000 (13:49 -0500)
committerMarkus Schulz <schulz@alpharesearch.de>
Sun, 21 Nov 2010 18:49:40 +0000 (13:49 -0500)
commit76298d59565ef45a2e14dd0c3aa49f926d039887
tree42d113810ddb36d204debd5b0aa79298dc812a08
parent9decfc653a11338bb0354acfcc8654bcfb506d9f
parent57556d65e1108cb151afd5e82c4cf089a72022ef
Merge branch 'debian' into systemtest

Conflicts:
Robocut.pro
Robocut.pro
autodist.sh
debian/Robocut.1
debian/changelog
debian/control
debian/docs
images/robocut.xpm