comparison main/PreferencesDialog.h @ 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 6d827453657f
children 33d0632255b5 e5e6625deb85
comparison
equal deleted inserted replaced
463:0ef4943f55ae 465:b3b9cc8f5466