deajan 4b888812ff Revert "Updated merge tool" ...

This reverts commit 0aee59e05e.

2016-08-06 16:13:11 +02:00

..

common_install.sh

Added installer template

2016-08-06 15:15:46 +02:00

debug_obackup.sh

Bumped version to dev

2016-08-06 14:04:35 +02:00

merge.sh

Revert "Updated merge tool"

2016-08-06 16:13:11 +02:00

n_obackup.sh

Bumped version to dev

2016-08-06 14:04:35 +02:00

ofunctions.sh

Updated ofunctions

2016-08-06 13:52:17 +02:00