summaryrefslogtreecommitdiff
path: root/vimperator
diff options
context:
space:
mode:
authorKris Maglione <kris@vimperator.org>2009-11-08 21:22:32 -0500
committerKris Maglione <kris@vimperator.org>2009-11-08 21:22:32 -0500
commit8ef1674c6ea574fe9994c12c5c930bb610672916 (patch)
tree407261c98376a4c2ef685dbf4dbdf5902390ceb7 /vimperator
parentb117f6749a8b513fd4ee0b2388a1233f3b067456 (diff)
parent865e075953ef312fbfe2722b01cb5d57676013d1 (diff)
downloadpentadactyl-8ef1674c6ea574fe9994c12c5c930bb610672916.tar.gz
Merge.
Diffstat (limited to 'vimperator')
-rw-r--r--vimperator/Makefile2
-rw-r--r--vimperator/NEWS5
2 files changed, 4 insertions, 3 deletions
diff --git a/vimperator/Makefile b/vimperator/Makefile
index a32c6663..893488c9 100644
--- a/vimperator/Makefile
+++ b/vimperator/Makefile
@@ -1,6 +1,6 @@
#### configuration
-VERSION = 1.0pre
+VERSION = 2.3a1pre
NAME = vimperator
include ../common/Makefile
diff --git a/vimperator/NEWS b/vimperator/NEWS
index 909f89d5..67bee9c0 100644
--- a/vimperator/NEWS
+++ b/vimperator/NEWS
@@ -1,11 +1,12 @@
2009-XX-XX:
+ * version 2.3a1pre
* add basic plugin authorship documentation
* plugins may now provide full-fleged ':help' documentation
* asciidoc is no longer required to build Vimperator
* the help system is newly modularized
-2009-XX-XX:
- * version 2.2a1pre
+2009-10-28:
+ * version 2.2
* IMPORTANT: Vimperator's licence has changed from the MPL/GPL/LGPL
tri-license to the MIT license.
* IMPORTANT: Map.flags has been replaced with individual properties.