merge master into root6

This commit is contained in:
2015-10-27 14:34:33 +01:00
4 changed files with 105 additions and 14 deletions

View File

@@ -1,5 +1,4 @@
## Process this file with automake to create Makefile.in
CLEANFILES = *~ core
CLEANFILES = *~ core moc_* ui_*