Merge pull request #626 from Atheros1/master
changed 2013 to 2014 in copyright notices
This commit is contained in:
commit
06dfd48d66
4
COPYING
4
COPYING
|
@ -1,5 +1,5 @@
|
||||||
Copyright (c) 2012-2013 Jonathan Warren
|
Copyright (c) 2012-2014 Jonathan Warren
|
||||||
Copyright (c) 2013 The Bitmessage Developers
|
Copyright (c) 2013-2014 The Bitmessage Developers
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|
4
LICENSE
4
LICENSE
|
@ -1,6 +1,6 @@
|
||||||
The MIT License (MIT)
|
The MIT License (MIT)
|
||||||
Copyright (c) 2012-2013 Jonathan Warren
|
Copyright (c) 2012-2014 Jonathan Warren
|
||||||
Copyright (c) 2013 The Bitmessage Developers
|
Copyright (c) 2013-2014 The Bitmessage Developers
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||||
this software and associated documentation files (the "Software"), to deal in
|
this software and associated documentation files (the "Software"), to deal in
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
|
|
||||||
# Form implementation generated from reading ui file 'about.ui'
|
# Form implementation generated from reading ui file 'about.ui'
|
||||||
#
|
#
|
||||||
# Created: Wed Nov 06 23:01:43 2013
|
# Created: Tue Jan 21 22:29:38 2014
|
||||||
# by: PyQt4 UI code generator 4.10.2
|
# by: PyQt4 UI code generator 4.10.3
|
||||||
#
|
#
|
||||||
# WARNING! All changes made in this file will be lost!
|
# WARNING! All changes made in this file will be lost!
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ class Ui_aboutDialog(object):
|
||||||
aboutDialog.setWindowTitle(_translate("aboutDialog", "About", None))
|
aboutDialog.setWindowTitle(_translate("aboutDialog", "About", None))
|
||||||
self.label.setText(_translate("aboutDialog", "PyBitmessage", None))
|
self.label.setText(_translate("aboutDialog", "PyBitmessage", None))
|
||||||
self.labelVersion.setText(_translate("aboutDialog", "version ?", None))
|
self.labelVersion.setText(_translate("aboutDialog", "version ?", None))
|
||||||
self.label_2.setText(_translate("aboutDialog", "<html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html>", None))
|
self.label_2.setText(_translate("aboutDialog", "<html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html>", None))
|
||||||
self.label_3.setText(_translate("aboutDialog", "<html><head/><body><p>Distributed under the MIT/X11 software license; see <a href=\"http://www.opensource.org/licenses/mit-license.php\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.opensource.org/licenses/mit-license.php</span></a></p></body></html>", None))
|
self.label_3.setText(_translate("aboutDialog", "<html><head/><body><p>Distributed under the MIT/X11 software license; see <a href=\"http://www.opensource.org/licenses/mit-license.php\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.opensource.org/licenses/mit-license.php</span></a></p></body></html>", None))
|
||||||
self.label_5.setText(_translate("aboutDialog", "This is Beta software.", None))
|
self.label_5.setText(_translate("aboutDialog", "This is Beta software.", None))
|
||||||
|
|
||||||
|
|
|
@ -74,7 +74,7 @@
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="text">
|
<property name="text">
|
||||||
<string><html><head/><body><p>Copyright © 2012-2013 Jonathan Warren<br/>Copyright © 2013 The Bitmessage Developers</p></body></html></string>
|
<string><html><head/><body><p>Copyright © 2012-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html></string>
|
||||||
</property>
|
</property>
|
||||||
<property name="alignment">
|
<property name="alignment">
|
||||||
<set>Qt::AlignCenter</set>
|
<set>Qt::AlignCenter</set>
|
||||||
|
|
Reference in New Issue
Block a user