Added note in docs that this is the dev branch.

Added mdpoole to LICENSE
Merge branch 'master' into dynamic_alloc_dev
2012-01-12 19:23:30 +02:00 · 2012-01-06 19:16:44 +02:00 · 2012-01-06 19:16:28 +02:00 · 2012-01-06 19:04:49 +02:00
2 changed files with 20 additions and 6 deletions
--- a/20
+++ b/20
@@ -1,11 +1,21 @@
 Copyright (c) 2011 Petteri Aimonen <jpa at nanopb.mail.kapsi.fi>
+Copyright (c) 2011 Michael Poole <mdpoole@troilus.org>

-This software is provided 'as-is', without any express or implied warranty. In no event will the authors be held liable for any damages arising from the use of this software.
+This software is provided 'as-is', without any express or 
+implied warranty. In no event will the authors be held liable 
+for any damages arising from the use of this software.

-Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
+Permission is granted to anyone to use this software for any 
+purpose, including commercial applications, and to alter it and 
+redistribute it freely, subject to the following restrictions:

-1. The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation would be appreciated but is not required.
+1. The origin of this software must not be misrepresented; you 
+   must not claim that you wrote the original software. If you use 
+   this software in a product, an acknowledgment in the product 
+   documentation would be appreciated but is not required.

-2. Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
+2. Altered source versions must be plainly marked as such, and 
+   must not be misrepresented as being the original software.

-3. This notice may not be removed or altered from any source distribution.
+3. This notice may not be removed or altered from any source 
+   distribution.
--- a/docs/menu.rst
+++ b/docs/menu.rst
@@ -3,7 +3,11 @@
    1) `Overview`_
    2) `Concepts`_
    3) `API reference`_
-    
+
+Note: This is the documentation for the *dynamic_alloc_dev* development branch. See here for the 
+documentation for the latest stable version:
+http://koti.kapsi.fi/~jpa/nanopb/docs/index.html
+
 .. _`Overview`: index.html
 .. _`Concepts`: concepts.html
 .. _`API reference`: reference.html
Author	SHA1	Message	Date
Petteri Aimonen	c2e0b9ed5d	Added note in docs that this is the dev branch.	2012-01-12 19:23:30 +02:00
Petteri Aimonen	592d4213fd	Added mdpoole to LICENSE	2012-01-06 19:16:44 +02:00
Petteri Aimonen	9a0a930a18	Merge branch 'master' into dynamic_alloc_dev	2012-01-06 19:16:28 +02:00
Petteri Aimonen	b519edba9d	Linewrapping in license	2012-01-06 19:04:49 +02:00