cc9cii 007c733578 Resolve merge issues and add back user preference setting for auto selecting a modified record. ...

(cherry picked from commit 321b1b5106a47500bffd4c78a66d3d6f44a06f5b)

Conflicts:
	apps/opencs/model/settings/usersettings.cpp

2015-11-07 07:17:46 +11:00

..

doc

Rename a variable to make it less confusing.

2015-11-02 18:46:21 +11:00

filter

Remove empty line at the beginning of files

2015-09-08 06:40:06 +10:00

settings

Resolve merge issues and add back user preference setting for auto selecting a modified record.

2015-11-07 07:17:46 +11:00

tools

Add a check for scale value of 0. Should resolve bug #2880.

2015-11-02 18:46:34 +11:00

world

Merge branch 'cc9cii' into jump-to-modified

2015-11-07 06:30:46 +11:00