marco baa61d0571 Merge branch 'master' into Refactor-settings ... Conflicts: oracle/CMakeLists.txt		2015-09-01 21:28:53 +02:00
..
migrations	Define permission levels for rooms	2015-08-15 21:00:51 -04:00
resources	svg+png updates	2015-04-28 16:06:36 +02:00
scripts	Added lower case country code on correction.	2015-08-11 15:46:59 -04:00
src	Merge branch 'master' into Refactor-settings	2015-09-01 21:28:53 +02:00
CMakeLists.txt	Servatrice portable + cmake options	2015-08-25 21:25:13 +02:00
servatrice.desktop	Servatrice: open in a terminal window when started from the menu	2014-10-11 13:38:07 +02:00
servatrice.ini.example	Define permission levels for rooms	2015-08-15 21:00:51 -04:00
servatrice.qrc	Renamed resources	2014-10-07 16:49:40 +02:00
servatrice.rc	Servatrice logo	2014-10-06 21:04:37 +02:00
servatrice.sql	Corrected miss-matched schema versions	2015-08-18 07:40:12 -04:00