diff res/xml/preferences.xml @ 165:924523c03ca7

merge
author Carl Byington <carl@five-ten-sg.com>
date Tue, 24 Jun 2014 12:39:43 -0700
parents 69333ca1563c
children f0b9ea35711a
line wrap: on
line diff