comparison res/xml/preferences.xml @ 103:1a34365fab9b

merge
author Carl Byington <carl@five-ten-sg.com>
date Tue, 17 Jun 2014 22:01:53 -0700
parents 9a6335a203b2
children 69333ca1563c
comparison
equal deleted inserted replaced
97:586b2eedb0d5 103:1a34365fab9b