aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2011-09-01 19:19:42 +0200
committerMax Kellermann <max@duempel.org>2011-09-01 19:19:42 +0200
commit6a3008d7ff787164124a43911145f7305c66aa7e (patch)
tree54090ac05037c9ba4c7536747462469744bb2531 /doc
parent140162191388063e41e33b53d4533e07529df870 (diff)
parent2556449b361c00d9c66cf85beb64d7c6458763ed (diff)
downloadmpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.gz
mpd-6a3008d7ff787164124a43911145f7305c66aa7e.tar.xz
mpd-6a3008d7ff787164124a43911145f7305c66aa7e.zip
Merge branch 'v0.16.x'
Conflicts: configure.ac src/output_control.c
Diffstat (limited to 'doc')
-rw-r--r--doc/developer.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/developer.xml b/doc/developer.xml
index c63e2c265..010b85064 100644
--- a/doc/developer.xml
+++ b/doc/developer.xml
@@ -57,7 +57,7 @@
Some example code:
</para>
- <programlisting lang="C">static inline bool
+ <programlisting lang="C">static inline int
foo(const char *abc, int xyz)
{
if (abc == NULL) {