diff main/PreferencesDialog.cpp @ 465:b3b9cc8f5466 integration_library

Merge with the Kiosk branch
author mathieub <mathieu.barthet@eecs.qmul.ac.uk>
date Mon, 25 Jul 2011 19:38:50 +0100
parents 4bccf2014f80
children 33d0632255b5 e5e6625deb85
line wrap: on
line diff