From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Tue, 30 Jun 2009 17:19:08 +0000 (+0100)
Subject: Merge branch 'origin'
X-Git-Tag: 1.9.2~90
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=commitdiff_plain;h=8d6cf0f224b5df9866eba9350343067edcee78dd

Merge branch 'origin'

Conflicts:
	pctb/TODO
---

8d6cf0f224b5df9866eba9350343067edcee78dd
diff --cc pctb/TODO
index 8088a10,9355540..6a603c6
--- a/pctb/TODO
+++ b/pctb/TODO
@@@ -1,8 -1,11 +1,6 @@@
 -make dict char update able to only add to one of upper/lower so that
 -we can have
 -		upper		lower
 -				in
 -		I  err
 -		Iron
 -  need to rethink all this
 -
 +add UI option to dictionary-manager to make user specify which dictionary
 +  to add multi-context entries to
 +install/test dictionary upload/approval
- onboard ship island name horizontal trim
  write real uploader
  test real uploader
- building island name extractor
- speed it up
+ further speedups