# HG changeset patch # User Flick # Date 1305132828 25200 # Node ID 71d1a5e47e7285375422fcee0577bb6d856d4154 # Parent c5b945c4209c258f1c83e2beb0c8f5036b6ed1f6# Parent 4c86db3cf5fcaafdc14b28976d432316bc7fe290 Merge 1.1 beta 7 into stable (with fixed version in TOC) diff -r c5b945c4209c -r 71d1a5e47e72 .hgtags --- a/.hgtags Tue May 10 10:32:11 2011 -0700 +++ b/.hgtags Wed May 11 09:53:48 2011 -0700 @@ -5,3 +5,5 @@ 455ef506f9695045737410a6529c9c6eb7d33022 1.1 beta 5 b2e401183d36cd1283df64eef68a92a9ce08cc46 1.1 beta 6 8fde9da2165208725cc960d54d4656e5a7d74aec 1.1 beta 7 +8fde9da2165208725cc960d54d4656e5a7d74aec 1.1 beta 7 +28f91ed1560ff659d92f3dd3d3042dd818d1d198 1.1 beta 7 diff -r c5b945c4209c -r 71d1a5e47e72 ReAction.toc --- a/ReAction.toc Tue May 10 10:32:11 2011 -0700 +++ b/ReAction.toc Wed May 11 09:53:48 2011 -0700 @@ -4,7 +4,7 @@ ## DefaultState: enabled ## LoadOnDemand: 0 ## Author: Flick -## Version: 1.1 beta 5 +## Version: 1.1 beta 7 ## SavedVariables: ReAction_DB ## X-Embeds: Ace3, LibKeyBound-1.0 ## X-Category: Action Bars