Merge branch 'master' into dev

This commit is contained in:
Felix Ruess
2012-02-08 23:14:35 +01:00
2 changed files with 2 additions and 2 deletions
+2 -2
View File
@@ -22,7 +22,7 @@ Feedback would be welcome to improve the Paparazzi guidelines.
/** @page stylec C Style Guide
This page contains guidelines for writing new C source code for the
OpenOCD project.
Paparazzi project.
@section styleformat Formatting Guide
@@ -90,7 +90,7 @@ So use @c #if not @c #ifdef to turn a feature on or off. This works fine, and do
/** @page styledoxygen Doxygen Style Guide
The following sections provide guidelines for OpenOCD developers
The following sections provide guidelines for Paparazzi developers
who wish to write Doxygen comments in the code or this manual.
For an introduction to Doxygen documentation,
see the @ref primerdoxygen.