-
luciash authored
Conflicts resolved manually using tc except one which looked better to keep in trunk some new prefs for pdf handling. Please check and next time do svn merges from 16.x yourself to avoid lot of conflicts in one merge... Thanks!
59d7c0d7