From: Andre Noll Date: Mon, 7 Dec 2009 17:06:55 +0000 (+0100) Subject: Merge branch 'maint' X-Git-Tag: v0.4.1~11 X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=05527588bd503e4748d801b641a9e3a6556525ad;p=paraslash.git Merge branch 'maint' Conflicts: Makefile.in NEWS web/index.in.html --- 05527588bd503e4748d801b641a9e3a6556525ad diff --cc Makefile.in index a24ba6ba,d04d0ea3..f1cf1e40 --- a/Makefile.in +++ b/Makefile.in @@@ -14,7 -13,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 := imaginary radiation ++codename := concurrent horizon DEBUG_CPPFLAGS += -Wno-sign-compare -g -Wunused -Wundef -W DEBUG_CPPFLAGS += -Wredundant-decls diff --cc NEWS index 9d953009,66ce1f3f..3f6ae459 --- a/NEWS +++ b/NEWS @@@ -1,15 -1,9 +1,15 @@@ NEWS ==== +---------------------------------------------- +0.4.1 (to be announced) "concurrent eternalty" +---------------------------------------------- + + - 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 --cc web/index.in.html index b685ac9d,65b7f0ed..9c02c30b --- a/web/index.in.html +++ b/web/index.in.html @@@ -1,10 -1,10 +1,14 @@@

Events