commit | 89173129c335c37cc9d44c06aade0d01356d76c3 | [log] [tgz] |
---|---|---|
author | Tom Schindl <tom.schindl@bestsolution.at> | Fri Nov 25 21:33:37 2016 +0100 |
committer | Tom Schindl <tom.schindl@bestsolution.at> | Fri Nov 25 21:33:37 2016 +0100 |
tree | 878d2b50759a2b21eac7a8889a02f7c6f6edda6f | |
parent | 7ef4f9330bc18c37f7450e3dc7bcbf0ec4ee86a3 [diff] | |
parent | 3662006c58523ce3b95aa4298c2d0261dae242b4 [diff] |
Merge branch '2.6.x' of ssh://git@gitlab.bestsolution.at:30022/sick/efxclipse.git into 2.6.x