Merge branch 'master' into dynamic_alloc_dev

Conflicts: tests/Makefile tests/test_encode1.c
2012-01-05 22:10:29 +02:00
parent accd93be8d 28aa0ce096
commit a2673f24fa
16 changed files with 1671 additions and 70 deletions
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -6,3 +6,4 @@ all: index.html concepts.html reference.html \

 %.html: %.rst
 	rst2html --stylesheet=lsr.css --link-stylesheet $< $@
+	sed -i 's!</head>!<link href="favicon.ico" type="image/x-icon" rel="shortcut icon" />\n</head>!' $@
--- a/docs/logo/logo.png
+++ b/docs/logo/logo.png
--- a/docs/logo/logo.svg
+++ b/docs/logo/logo.svg
--- a/docs/logo/logo16px.png
+++ b/docs/logo/logo16px.png
--- a/docs/logo/logo48px.png
+++ b/docs/logo/logo48px.png