[bt-devel] Some Changes

[Fred Saalbach]

I was going to fix a problem with the graphics tag, however i had a
conflict that I am not sure how to resolve.  The conflict is with a file
I had not intended to touch.  Is there an easy way out of this. 
Previously when I had this problem I checked out a new copy of the CVS.

In text mode following commit -m
cvs server: file `bibletime.kdevprj' had a conflict and has not been
modified
cvs [server aborted]: correct above errors first!
--

I am also having a problem with cervisia and the shared key.  when
attempting to update from inside cervisia, the following error is
returned:

cvs update -l -d -P '.' 2>&1
You have no controlling tty.  Cannot read passphrase.
cvs [update aborted]: end of file from server (consult above messages if
any)
[Exited with status 1]

.ssh/identity
.ssh/identity.pub
.ssh/known_hosts

all exist, and the public key was sent to sourceforge.



Fred Saalbach
-----------------------------------
-- 
II Chronicles 7:14 (The Webster Bible)
If my people, who are called by my name, shall humble themselves, and
pray, and seek my face, and turn from their wicked ways; then will I
hear from heaven, and will forgive their sin, and will heal their land.

Luther Bible
Und mein Volk sich demütigt, das nach meinem Namen genannt ist, daß sie
beten und mein Angesicht suchen und sich von ihren bösen Wegen bekehren
werden: so will ich vom Himmel hören und ihre Sünde vergeben und ihr
Land heilen.

Spanish Reina-Valera Bible
Si se humillare mi pueblo, sobre los cuales ni nombre es invocado, y
oraren, y buscaren mi rostro, y se convirtieren de sus malos caminos;
entonces yo oiré desde los cielos, y perdonaré sus pecados, y sanaré su
tierra.