Permalink
Browse files

Updating copyright notices and authorship information after the merge.

  • Loading branch information...
1 parent 1bbd1b2 commit 38a28bbb2d27df5637c3bcaca1669d3b93b28732 @cesarsouza cesarsouza committed May 10, 2015
Showing with 34 additions and 9 deletions.
  1. +25 −1 Contributors.txt
  2. +5 −4 Copyright.txt
  3. +1 −1 License.txt
  4. +2 −2 Setup/Installer/Accord.iss
  5. +1 −1 Setup/version.cmd
View
@@ -7,7 +7,7 @@
decided to share their work and contribute to its development. The
space below enlists a few of those people who either agreed to help
or actively participated on its development:
-
+
- Anders Gustafsson
- Antonino Porcino
@@ -25,3 +25,27 @@
- Mikkel Porse Rasmussen
- Peter Sergio Larsen
- Remy Disp
+
+
+In May 2015, the project has been merged with the AForge.NET codebase,
+incorporating the work of even more contributors. In a true spirit of
+community, notorious previous contributors are also listed below:
+
+
+ - Andrew Kirillov (the project creator, with the best ideas)
+ - F�bio Caversan
+ - Alejandro Pirola
+ - Cezary Wagner
+ - Dale McCoy
+ - Fabio Caversan
+ - Frank Nagl
+ - Israel Lot
+ - Jeremy Noring
+ - Joan Charmant
+ - Joris Geurts
+ - Krzysztof Blacha
+ - Kyle Parrigan
+ - Markus Falkensteiner
+ - Mladen Prajdic
+ - Volodymyr Goncharov
+ - Yves Vander Haeghen
View
@@ -1,6 +1,6 @@
The Accord.NET Framework
-Copyright (c) 2009-2015, César Roberto de Souza <cesarsouza at gmail.com>
+Copyright (c) 2009-2015, Accord.NET Authors <authors @ accord-framework.net>
This library is free software; you can redistribute it and/or modify it under the terms of
the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -31,9 +31,10 @@ Creative Commons Attribution/Share-Alike License. All referenced sections includ
original article page. If you think you have found something which has not been properly linked, please
let me know so it can be corrected.
-Overall framework architecture and style was greatly inspired by AForge.NET. The AForge.NET
-Framework is a copyrighted work by Andrew Kirillov. This framework (Accord.NET) is in no way
-affiliated with AForge.NET, its authors or contributors.
+Overall framework architecture and style was greatly inspired by AForge.NET. In May 2015, this project
+has been merged with the AForge.NET framework since public support for AForge.NET has ended. The original
+AForge.NET Framework is a copyrighted work by Andrew Kirillov, altough developed and shared under the same
+LGPL license.
View
@@ -1,6 +1,6 @@
The Accord.NET Framework
-Copyright (c) 2009-2014, C�sar Roberto de Souza <cesarsouza at gmail.com>
+Copyright (c) 2009-2015, Accord.NET Authors <authors @ accord-framework.net>
This library is free software; you can redistribute it and/or modify it under the terms of
the GNU Lesser General Public License as published by the Free Software Foundation; either
@@ -1,6 +1,6 @@
; Accord.NET setup project
-#define VERSION GetStringFileInfo("..\..\Release\net40\Accord.dll", "ProductVersion")
+#define VERSION GetStringFileInfo("..\..\Release\net45\Accord.dll", "ProductVersion")
#pragma message "Creating package for Accord.NET " + VERSION
[Setup]
AppName=Accord.NET Framework
@@ -10,7 +10,7 @@ AppPublisher=Accord.NET
AppPublisherURL=http://accord-framework.net
AppSupportURL=http://accord-framework.net
AppUpdatesURL=http://accord-framework.net
-AppCopyright=Copyright � C�sar Souza, 2009-2015
+AppCopyright=Copyright � Accord.NET authors, 2009-2015
VersionInfoVersion={#VERSION}
DefaultDirName={pf}\Accord.NET\Framework
DefaultGroupName=Accord.NET\Framework
View
@@ -1 +1 @@
-set version=2.15.0
+set version=3.0.0-alpha

0 comments on commit 38a28bb

Please sign in to comment.