Merge branch 'master' into develCommanline

This commit is contained in:
jfmcarreira committed 2015-02-25 18:04:15 +00:00
commit 85cfa467b9
4 files changed
+6 -6

No files matched your search

+1 -1
View File
@@ -13,7 +13,7 @@ SET( PROJECT_NAME "playuver" )
PROJECT( ${PROJECT_NAME} )
SET( PLAYUVER_VERSION_MAJOR "0" )
SET( PLAYUVER_VERSION_MINOR "5" )
SET( PLAYUVER_VERSION_PATCH "0" )
SET( PLAYUVER_VERSION_PATCH "1" )
SET( PLAYUVER_VERSION "${PLAYUVER_VERSION_MAJOR}.${PLAYUVER_VERSION_MINOR}.${PLAYUVER_VERSION_PATCH}")
######################################################################################
+1 -1
View File
@@ -47,7 +47,7 @@ AboutDialog::AboutDialog(QWidget *parent)
.arg(QApplication::applicationName())
.arg(QApplication::applicationVersion())
.arg(tr("Enhanced open-source QT based raw video player"))
.arg(tr("Copyright 2014 Luis Lucas and Joao Carreira")));
.arg(tr("Copyright 2014-2015 Luis Lucas and Joao Carreira")));
label->setWordWrap(true);
QWidget *topWidget = new QWidget;
+2 -2
View File
@@ -1,6 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
+2 -2
View File
@@ -1,6 +1,6 @@
/* This file is a part of plaYUVer project
* Copyright (C) 2014 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
* Copyright (C) 2014-2015 by Luis Lucas (luisfrlucas@gmail.com)
* Joao Carreira (jfmcarreira@gmail.com)
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by