Commit ed598d6

Roman Donchenko

committed

Merge remote-tracking branch 'origin/2.4'

Conflicts: testdata/perf/ocl.xml

2 parents cce34e9 + a1f05dd commit ed598d6Copy full SHA for ed598d6

1 file changed

+2126

-459

lines changed

+2126

-459

lines changed

Comments

(0)