summaryrefslogtreecommitdiff
path: root/examples/docker-minimal/docker/merge.sh
Commit message (Collapse)AuthorAgeFilesLines
* chmod +x merge.shLinus Nordberg2015-02-271-0/+0
| | | | Also fix path in README.
* Update README and finish merge.sh in the minimal docker example.extmergeLinus Nordberg2015-02-271-1/+13
|
* Add packaging and examples.Linus Nordberg2015-02-241-0/+9