Merge branch 'master' into devel

This commit is contained in:
jfmcarreira committed 2015-01-06 23:49:19 +00:00
commit d0015ffaaa
2 files changed
+8 -6

No files matched your search

+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