Merge branch 'master' of github.com:mapmapteam/mapmap

This commit is contained in:
Tats
2014-03-22 02:03:25 -04:00
27 changed files with 1761 additions and 33 deletions

View File

@@ -345,11 +345,10 @@ void MainWindow::about()
// Pop-up about dialog.
QMessageBox::about(this, tr("About MapMap"),
tr("<h2>MapMap "
LIBREMAPPING_VERSION
MAPMAP_VERSION
"</h2>"
"<p>Copyright &copy; 2013 Sofian Audry"
"<p>Copyright &copy; 2013 Alexandre Quessy"
"<p>Copyright &copy; 2013 Vasilis Liaskovitis"
"<p>Copyright &copy; 2013 Sofian Audry, Alexandre Quessy, Julien Keable, "
"Mike Latona and Vasilis Liaskovitis."
"<p>MapMap is a free software for video mapping. "
"<p>Projection mapping, also known as video mapping and spatial augmented reality, "
"is a projection technology used to turn objects, often irregularly shaped, into "