[Pkg-privacy-commits] [pidgin-otr] 101/255: Merge branch 'helpfiles'

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch experimental
in repository pidgin-otr.

commit d811dc614d8bba9fc435d6ee7c9a731a78f65ff4
Merge: 8caae1f ba17688
Author: Rob Smits <rdfsmits at cs.uwaterloo.ca>
Date:   Thu Jun 7 09:40:16 2012 -0400

    Merge branch 'helpfiles'

 help/auth-ans.png                 | Bin 0 -> 35336 bytes
 help/auth-mf.png                  | Bin 0 -> 50157 bytes
 help/auth-qa.png                  | Bin 0 -> 35657 bytes
 help/auth-ss.png                  | Bin 0 -> 33183 bytes
 help/authenticate-dialog.png      | Bin 0 -> 22430 bytes
 help/authenticate-error.png       | Bin 0 -> 18897 bytes
 help/authenticate-fail.png        | Bin 0 -> 18175 bytes
 help/authenticate-success.png     | Bin 0 -> 18626 bytes
 help/authenticate.php             | 134 ++++++++++++++++++++++
 help/authenticate_fr.php          | 147 ++++++++++++++++++++++++
 help/badsecret.png                | Bin 0 -> 21443 bytes
 help/conv-empty.png               | Bin 0 -> 13381 bytes
 help/conv-menuauthenticate.png    | Bin 0 -> 35745 bytes
 help/conv-otrmenu.png             | Bin 0 -> 25379 bytes
 help/conv-private.png             | Bin 0 -> 35651 bytes
 help/conv-unauthenticated.png     | Bin 0 -> 30970 bytes
 help/fingerprint-dialog.png       | Bin 0 -> 30205 bytes
 help/fingerprint.php              |  45 ++++++++
 help/finished-button.png          | Bin 0 -> 1376 bytes
 help/goodsecret.png               | Bin 0 -> 23840 bytes
 help/helpnav.php                  |  12 ++
 help/levels.php                   |  46 ++++++++
 help/levels_fr.php                |  44 +++++++
 help/main.css                     | 234 ++++++++++++++++++++++++++++++++++++++
 help/notprivate-ab.png            | Bin 0 -> 10458 bytes
 help/notprivate-button.png        | Bin 0 -> 1586 bytes
 help/private-ab.png               | Bin 0 -> 10358 bytes
 help/private-button.png           | Bin 0 -> 1303 bytes
 help/progress-error.png           | Bin 0 -> 16999 bytes
 help/progress-failed.png          | Bin 0 -> 16692 bytes
 help/progress-success-maywant.png | Bin 0 -> 22794 bytes
 help/progress-success.png         | Bin 0 -> 18951 bytes
 help/session-for_another.png      | Bin 0 -> 31304 bytes
 help/session-menu.png             | Bin 0 -> 77042 bytes
 help/session-not_most_recent.png  | Bin 0 -> 37018 bytes
 help/session-notification.png     | Bin 0 -> 34087 bytes
 help/sessions.php                 |  82 +++++++++++++
 help/unrecognized.png             | Bin 0 -> 24679 bytes
 help/unverified-ab.png            | Bin 0 -> 10168 bytes
 help/unverified-button.png        | Bin 0 -> 1429 bytes
 help/unverified.php               |   1 +
 41 files changed, 745 insertions(+)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-privacy/packages/pidgin-otr.git