aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-07-05 15:13:19 +0200
committerSven Gothel <[email protected]>2014-07-05 15:13:19 +0200
commit06fc570f70dc5ccfad7399d8426bdf224c239a5a (patch)
treef844f7c9bcd564a8d945e5e7f1f085409f91d3b1 /src/test
parentbda482e4eee76a5ba2139645682ae64dadacbc6b (diff)
parent5951b33b303df3a12888fe0fbc5ccc88112a3984 (diff)
Merge remote-tracking branch 'github-mark/master' (Bug 1023/Bug 1024)
Conflicts: make/scripts/tests.sh (build.xml: Using <copy tofile=".."/> instead of producing new jar files via <jar> to keep identity)
Diffstat (limited to 'src/test')
0 files changed, 0 insertions, 0 deletions