branches/stable-2.1:

* Bug fixed: Crash when rebuilding sqlite wiki on 64 bit Linux
* Bug fixed: Deletion of wrong versioning data on MPT import
* Bug fixed: Search index from 64bit Python not compatible with 32bit
  Python (due to hash function). Changed index format number from 2 to 3


branches/mbutscher/work:
* New insertion "search" to create arbitrary searches
* Internal: New function wxHelper.getHtmlFromClipboard()
* Bug fixed: "Move to file storage" failed
* Windows: Set focus for image tooltip back to editor (TODO: add for
  other OS')
* Support for "wikirel:" protocol to support relative links to other wikis
* Basic Vi emulation for editor (thanks to Ross)
* Bug fixed: Crash when rebuilding sqlite wiki on 64 bit Linux
* Bug fixed: Search index from 64bit Python not compatible with 32bit
  Python (due to hash function). Changed index format number from 2 to 3
* Support to set readonly per wiki page
* Bug fixed: Deletion of wrong versioning data on MPT import
* Trashcan support
* Added "page:" prefix for boolean regex search to search for page name
* No tree refresh during wiki rebuild
* Bug fixed: Exception when changing "global/*" func. pages
* Black lists (global and wiki-dependent) for non-camelcase
  (=bracketed) wikiwords added
* Activation (double click or press return) on collapsed todo or
  attribute tree item with one child which represents a wiki page opens
  this wiki page
* Some renaming of tree functions

.gitattributes

@@ -673,8 +673,10 @@ lib/pwiki/StringOps.py -text
 lib/pwiki/SystemInfo.py -text
 lib/pwiki/TempFileSet.py -text
 lib/pwiki/TextTree.py -text
+lib/pwiki/Trashcan.py -text
 lib/pwiki/UserActionCoord.py -text
 lib/pwiki/Utilities.py -text
+lib/pwiki/ViHelper.py -text
 lib/pwiki/WikiDocument.py -text
 lib/pwiki/WikiExceptions.py -text
 lib/pwiki/WikiHtmlView.py -text

Consts.py

@@ -23,8 +23,8 @@
 # (1, 9, 104, 2) is something after 1.9beta04
 # (2, 0, 300, 0) is 2.0final
 
-VERSION_TUPLE = ("wikidPad", 2, 2, 104, 2)
-VERSION_STRING = "wikidPad 2.2beta04_2"
+VERSION_TUPLE = ("wikidPad", 2, 2, 105, 0)
+VERSION_STRING = "wikidPad 2.2beta05"
 HOMEPAGE = u"http://wikidpad.sourceforge.net"
 
 CONFIG_FILENAME = "WikidPad.config"
@@ -100,7 +100,7 @@
 
 # Version number of the current searchindex. If number doesn't match with
 # number in configuration file, index must be rebuild
-SEARCHINDEX_FORMAT_NO = 2
+SEARCHINDEX_FORMAT_NO = 3