Mercurial > wow > mailopener

changeset 174:463e29ca6b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More merging'
author Zachary Kotlarek <zach@kotlarek.com>
date Sun, 10 Mar 2013 16:08:39 -0700
parents 7452702f6f35 (diff) f401a8ac72fe (current diff)
children 14096395dd93
files .hgtags MailOpener.toc
diffstat 2 files changed, 7 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Mar 10 15:41:58 2013 -0700
+++ b/.hgtags	Sun Mar 10 16:08:39 2013 -0700
@@ -50,3 +50,6 @@
 0000000000000000000000000000000000000000 v1.2.15
 57f3b638af3901bddd7631c27f07371f6ef06cd1 v1.2.15
 624a9d9a59314db0ea30f6a9197dbaeb877fde0c v1.2.16
+362c47facc5a0e2a4044d5bdfab1583a014dbd99 v1.3.0-beta
+38dddadc7b0d4da14a2c3810775d0224ce19b1a1 v1.3.1-beta
+74407c4a8c975db187157f7e9204f44dfd37ceb4 v1.3.2-beta
--- a/MailOpener.toc	Sun Mar 10 15:41:58 2013 -0700
+++ b/MailOpener.toc	Sun Mar 10 16:08:39 2013 -0700
@@ -1,7 +1,11 @@
 ## Interface: 50200
 ## Title: Mail Opener
 ## Notes: Mail Opener will automatically retrieve all your mail from the mailbox.
+<<<<<<< local
+## Author: Zerotorescue, profplump
+=======
 ## Author: Zerotorescue (at EU - Al'Akir), profplump
+>>>>>>> other
 ## Version: @project-version@
 ## SavedVariables: MailOpenerDB
 ## LoadManagers: AddonLoader