Mercurial > hg > digilib

comparison common-imagej/pom.xml @ 1660:75a74f7045b4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge branch 'master' into release-2.5 Conflicts: common/src/main/java/digilib/conf/DigilibConfiguration.java
author Robert Casties <r0bcas7@gmail.com>
date Tue, 21 Nov 2017 15:18:31 +0100
parents 392a149ed4d6
children cf9dcddf4ec6
comparison
equal deleted inserted replaced
1638:dc440131299b 1660:75a74f7045b4