V0.6 #852

Merged
Atheros1 merged 399 commits from v0.6 into master 2016-05-03 01:58:38 +02:00
6 changed files with 12 additions and 12 deletions
Showing only changes of commit b724d3ee4f - Show all commits

View File

@ -1,5 +1,5 @@
Copyright (c) 2012-2015 Jonathan Warren Copyright (c) 2012-2016 Jonathan Warren
Copyright (c) 2013-2015 The Bitmessage Developers Copyright (c) 2013-2016 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

View File

@ -1,6 +1,6 @@
The MIT License (MIT) The MIT License (MIT)
Copyright (c) 2012-2014 Jonathan Warren Copyright (c) 2012-2016 Jonathan Warren
Copyright (c) 2013-2014 The Bitmessage Developers Copyright (c) 2013-2016 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

4
debian/copyright vendored
View File

@ -3,11 +3,11 @@ Upstream-Name:
Source: Source:
Files: * Files: *
Copyright: Copyright 2014 Bob Mottram (4096 bits) <bob@robotics.uk.to> Copyright: Copyright 2016 Bob Mottram (4096 bits) <bob@robotics.uk.to>
License: MIT License: MIT
Files: debian/* Files: debian/*
Copyright: Copyright 2014 Bob Mottram (4096 bits) <bob@robotics.uk.to> Copyright: Copyright 2016 Bob Mottram (4096 bits) <bob@robotics.uk.to>
License: MIT License: MIT
License: MIT License: MIT

View File

@ -1,5 +1,5 @@
# Copyright (c) 2012-2014 Jonathan Warren # Copyright (c) 2012-2016 Jonathan Warren
# Copyright (c) 2012-2014 The Bitmessage developers # Copyright (c) 2012-2016 The Bitmessage developers
comment= """ comment= """
This is not what you run to run the Bitmessage API. Instead, enable the API This is not what you run to run the Bitmessage API. Instead, enable the API

View File

@ -1,6 +1,6 @@
#!/usr/bin/env python2.7 #!/usr/bin/env python2.7
# Copyright (c) 2012 Jonathan Warren # Copyright (c) 2012-2016 Jonathan Warren
# Copyright (c) 2012 The Bitmessage developers # Copyright (c) 2012-2016 The Bitmessage developers
# Distributed under the MIT/X11 software license. See the accompanying # Distributed under the MIT/X11 software license. See the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php. # file COPYING or http://www.opensource.org/licenses/mit-license.php.

View File

@ -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-2014 Jonathan Warren<br/>Copyright © 2013-2014 The Bitmessage Developers</p></body></html>", None)) self.label_2.setText(_translate("aboutDialog", "<html><head/><body><p>Copyright © 2012-2016 Jonathan Warren<br/>Copyright © 2013-2016 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))