summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2010-07-19 17:21:22 +0200
committerJonas Smedegaard <dr@jones.dk>2010-07-19 17:21:22 +0200
commitbb7c55fcb50f8a51e30e04b46dea2e18a0143191 (patch)
tree9b3a80e05e8e3d78d06bd6fb39ab3b9fea08a75d /Makefile
parent1884e7b5dcabf7afba625e9db79cdfce73ccda66 (diff)
parent077f4b7319c36f2c8bc243b462a992f10e896573 (diff)
Merge branch 'master' into allinone
Conflicts (merge old and new parts): .gitmodules
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d1ebc04..1cdbc56 100644
--- a/Makefile
+++ b/Makefile
@@ -1,6 +1,6 @@
SOURCES = ikiwiki
-ikiwiki_VERSION = 2.62.1
+ikiwiki_VERSION = 3.20100704
# modules (subproject extension names) used. Expands SOURCES
ikiwiki_MODULES = templates basewiki smiley directives
# locales used. Expands SOURCES