Merge branch 'maint'

Conflicts:

	Makefile.in
	NEWS
	web/index.in.html

diff --git a/Makefile.in b/Makefile.in
index a24ba6bae03256033d394119dec43e02550b6b7d..f1cf1e40640a8347ae78edb0d7c9759b87716d17 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,7 +14,7 @@ build_date := $(shell date)
 uname_s := $(shell uname -s 2>/dev/null || echo "UNKNOWN_OS")
 uname_rs := $(shell uname -rs)
 cc_version := $(shell $(CC) --version | head -n 1)
-codename := concurrent eternalty
+codename := concurrent horizon
 
 DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W
 DEBUG_CPPFLAGS += -Wredundant-decls

diff --git a/NEWS b/NEWS
index 9d9530092caf6ff162b6467212337de186045745..3f6ae4590bf5febd511f5b71cebd635b12512a5c 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -7,9 +7,9 @@ NEWS
 
        - wma support
 
-------------------------------------------
-0.3.6 (to be announced) "cubic continuity"
-------------------------------------------
+-------------------------------------
+0.3.6 (2009-12-07) "cubic continuity"
+-------------------------------------
 
 Quite a few bugs have been found and fixed since 0.3.5, so here's
 another 0.3.x release. No new features.

diff --git a/versions/paraslash-0.3.6.tar.bz2 b/versions/paraslash-0.3.6.tar.bz2
new file mode 100644 (file)
index 0000000..3433a01
Binary files /dev/null and b/versions/paraslash-0.3.6.tar.bz2 differ

diff --git a/versions/paraslash-0.3.6.tar.bz2.asc b/versions/paraslash-0.3.6.tar.bz2.asc
new file mode 100644 (file)
index 0000000..cb571bb
--- /dev/null
+++ b/versions/paraslash-0.3.6.tar.bz2.asc
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD8DBQBLHTO5Wto1QDEAkw8RAtzpAKCMU4BmDjwy+GBXUVDTCKkh9nTX3wCfe/2N
+8tyHsmUOB6MVi2CzFzEdzmE=
+=SUFL
+-----END PGP SIGNATURE-----

diff --git a/web/index.in.html b/web/index.in.html
index b685ac9d162d7c3eb8a5b2eb6a011c411ab74d9e..9c02c30b23094faa1b66ed0c8f54206291294042 100644 (file)
--- a/web/index.in.html
+++ b/web/index.in.html
@@ -1,6 +1,10 @@
 <h1>Events</h1>
 <hr>
 <ul>
+       <li>2009-12-07: <a href="versions/paraslash-0.3.6.tar.bz2">paraslash-0.3.6</a>
+               <a href="versions/paraslash-0.3.6.tar.bz2.asc">(sig)</a>
+               "cubic continuity"
+       </li>
        <li>2009-11-10: <a href="versions/paraslash-0.4.0.tar.bz2">paraslash-0.4.0</a>
                <a href="versions/paraslash-0.4.0.tar.bz2.asc">(sig)</a>
                "simultaneous independence"