comparison MailOpener.toc @ 174:463e29ca6b08

More merging'
author Zachary Kotlarek <zach@kotlarek.com>
date Sun, 10 Mar 2013 16:08:39 -0700
parents 135e5ef42f2b f401a8ac72fe
children 82f9ed7a8cce
comparison
equal deleted inserted replaced
173:7452702f6f35 174:463e29ca6b08
1 ## Interface: 50200 1 ## Interface: 50200
2 ## Title: Mail Opener 2 ## Title: Mail Opener
3 ## Notes: Mail Opener will automatically retrieve all your mail from the mailbox. 3 ## Notes: Mail Opener will automatically retrieve all your mail from the mailbox.
4 <<<<<<< local
4 ## Author: Zerotorescue, profplump 5 ## Author: Zerotorescue, profplump
6 =======
7 ## Author: Zerotorescue (at EU - Al'Akir), profplump
8 >>>>>>> other
5 ## Version: @project-version@ 9 ## Version: @project-version@
6 ## SavedVariables: MailOpenerDB 10 ## SavedVariables: MailOpenerDB
7 ## LoadManagers: AddonLoader 11 ## LoadManagers: AddonLoader
8 ## X-LoadOn-Slash: /mo, /mailopen, /mailopener 12 ## X-LoadOn-Slash: /mo, /mailopen, /mailopener
9 ## X-LoadOn-Mailbox: true 13 ## X-LoadOn-Mailbox: true