WowAce

------------------------------------------------------------------------
r86 | cielazure | 2012-09-27 09:45:43 +0000 (Thu, 27 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/localization.lua

update version info
------------------------------------------------------------------------
r85 | cielazure | 2012-09-27 09:45:16 +0000 (Thu, 27 Sep 2012) | 2 lines
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml

fix minor bug

------------------------------------------------------------------------
r84 | cielazure | 2012-09-27 09:31:53 +0000 (Thu, 27 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua

fix reset cooldown
------------------------------------------------------------------------
r83 | cielazure | 2012-09-27 08:48:28 +0000 (Thu, 27 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua
   M /trunk/MasterShapeShifter/MSS_Globals.xml
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml
   M /trunk/MasterShapeShifter/localization.lua
   M /trunk/MasterShapeShifter/localization.zhCN.lua
   M /trunk/MasterShapeShifter/localization.zhTW.lua

add clickable aura
------------------------------------------------------------------------
r82 | cielazure | 2012-09-27 08:21:57 +0000 (Thu, 27 Sep 2012) | 2 lines
Changed paths:
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.xml

TalentActionBar range detect
fix a faerie sworm bug
------------------------------------------------------------------------
r81 | cielazure | 2012-09-27 07:44:52 +0000 (Thu, 27 Sep 2012) | 2 lines
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua
   M /trunk/MasterShapeShifter/MSS_Globals.xml
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua

disable for other classes

------------------------------------------------------------------------
r80 | cielazure | 2012-09-27 07:44:16 +0000 (Thu, 27 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.lua

organize code
------------------------------------------------------------------------
r79 | cielazure | 2012-09-27 07:16:00 +0000 (Thu, 27 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml

fix dectect debuff's caster
------------------------------------------------------------------------
r78 | cielazure | 2012-09-27 07:14:47 +0000 (Thu, 27 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua

remove unused code
------------------------------------------------------------------------
r77 | cielazure | 2012-09-26 19:44:12 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml

organize code
------------------------------------------------------------------------
r76 | cielazure | 2012-09-26 16:36:55 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.xml
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml

several minor fix
------------------------------------------------------------------------
r75 | cielazure | 2012-09-26 15:56:48 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_Symbiosis/MasterShapeShifter_Symbiosis.toc
   M /trunk/MasterShapeShifter_TalentBar/MasterShapeShifter_TalentBar.toc

update toc
------------------------------------------------------------------------
r74 | cielazure | 2012-09-26 15:39:00 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.toc

update toc description for zhCN zhTW
------------------------------------------------------------------------
r73 | cielazure | 2012-09-26 14:44:16 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua

fix comboFrame won't change on feral spec
------------------------------------------------------------------------
r72 | cielazure | 2012-09-26 14:10:29 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua

ComboFrame uses combo point in cat form regardless of the current specialiaztion
------------------------------------------------------------------------
r71 | cielazure | 2012-09-26 13:47:07 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml

move player hp bar on top of power bar
------------------------------------------------------------------------
r70 | cielazure | 2012-09-26 12:54:21 +0000 (Wed, 26 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua

fix cooldown bug for passivs talent
------------------------------------------------------------------------
r68 | cielazure | 2012-09-25 15:21:27 +0000 (Tue, 25 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/localization.lua

update version info
------------------------------------------------------------------------
r67 | cielazure | 2012-09-25 15:19:50 +0000 (Tue, 25 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/localization.lua
   M /trunk/MasterShapeShifter/localization.zhCN.lua
   M /trunk/MasterShapeShifter/localization.zhTW.lua
   M /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.xml
   M /trunk/MasterShapeShifter_TalentBar/Bindings.xml
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.xml

rewrite the code for talent action bar
------------------------------------------------------------------------
r66 | cielazure | 2012-09-25 14:12:33 +0000 (Tue, 25 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.lua

organize code
------------------------------------------------------------------------
r65 | cielazure | 2012-09-25 11:48:55 +0000 (Tue, 25 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua

remove print function
------------------------------------------------------------------------
r64 | cielazure | 2012-09-25 08:48:16 +0000 (Tue, 25 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua
   M /trunk/MasterShapeShifter/MSS_Globals.xml
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.xml
   M /trunk/MasterShapeShifter/localization.lua
   M /trunk/MasterShapeShifter/localization.zhCN.lua
   M /trunk/MasterShapeShifter/localization.zhTW.lua

add option that changes power bar based on shapeshift instead of specialization
------------------------------------------------------------------------
r63 | cielazure | 2012-09-24 20:51:17 +0000 (Mon, 24 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.xml

organize code
------------------------------------------------------------------------
r62 | cielazure | 2012-09-24 20:35:35 +0000 (Mon, 24 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Minimap.lua
   M /trunk/MasterShapeShifter/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter/localization.lua
   M /trunk/MasterShapeShifter/localization.zhCN.lua
   M /trunk/MasterShapeShifter/localization.zhTW.lua

organize code
------------------------------------------------------------------------
r58 | cielazure | 2012-09-24 20:14:45 +0000 (Mon, 24 Sep 2012) | 1 line
Changed paths:
   A /trunk/MasterShapeShifter/MSS_Minimap.lua

add file minimap
------------------------------------------------------------------------
r56 | cielazure | 2012-09-24 13:39:45 +0000 (Mon, 24 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/localization.lua

update version info
------------------------------------------------------------------------
r55 | cielazure | 2012-09-24 13:38:12 +0000 (Mon, 24 Sep 2012) | 1 line
Changed paths:
   D /trunk/MasterShapeShifter_Symbiosis/localization.lua
   D /trunk/MasterShapeShifter_Symbiosis/localization.zhCN.lua
   D /trunk/MasterShapeShifter_Symbiosis/localization.zhTW.lua
   D /trunk/MasterShapeShifter_Symbiosis/localizations.xml

move localization files to core rep
------------------------------------------------------------------------
r54 | cielazure | 2012-09-24 13:37:37 +0000 (Mon, 24 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua
   M /trunk/MasterShapeShifter/MSS_Globals.xml
   M /trunk/MasterShapeShifter/MasterShapeShifter.toc
   M /trunk/MasterShapeShifter/localization.lua
   M /trunk/MasterShapeShifter/localization.zhCN.lua
   M /trunk/MasterShapeShifter/localization.zhTW.lua
   M /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.lua
   M /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.xml
   M /trunk/MasterShapeShifter_Symbiosis/MasterShapeShifter_Symbiosis.toc

improve symbiosis panel
------------------------------------------------------------------------
r53 | cielazure | 2012-09-23 22:12:07 +0000 (Sun, 23 Sep 2012) | 1 line
Changed paths:
   M /trunk

update rep info
------------------------------------------------------------------------
r52 | cielazure | 2012-09-23 22:11:32 +0000 (Sun, 23 Sep 2012) | 1 line
Changed paths:
   A /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.lua
   A /trunk/MasterShapeShifter_Symbiosis/MSS_Symbiosis.xml
   A /trunk/MasterShapeShifter_Symbiosis/MasterShapeShifter_Symbiosis.toc
   A /trunk/MasterShapeShifter_Symbiosis/localization.lua
   A /trunk/MasterShapeShifter_Symbiosis/localization.zhCN.lua
   A /trunk/MasterShapeShifter_Symbiosis/localization.zhTW.lua
   A /trunk/MasterShapeShifter_Symbiosis/localizations.xml

add symbiosis panel
------------------------------------------------------------------------
r51 | cielazure | 2012-09-23 22:10:54 +0000 (Sun, 23 Sep 2012) | 1 line
Changed paths:
   M /trunk/.pkgmeta

update package info
------------------------------------------------------------------------
r50 | cielazure | 2012-09-23 22:10:08 +0000 (Sun, 23 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter/MSS_Globals.lua
   A /trunk/MasterShapeShifter_Symbiosis
   M /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua
   M /trunk/MasterShapeShifter_TalentBar/MasterShapeShifter_TalentBar.toc

add symbiosis panel
------------------------------------------------------------------------
r48 | cielazure | 2012-09-22 20:44:40 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   M /trunk/.pkgmeta

update pkgmeta
------------------------------------------------------------------------
r47 | cielazure | 2012-09-22 20:40:30 +0000 (Sat, 22 Sep 2012) | 2 lines
Changed paths:
   A /trunk/.pkgmeta (from /trunk/.pkgmeta.txt:46
   D /trunk/.pkgmeta.txt

rename

------------------------------------------------------------------------
r46 | cielazure | 2012-09-22 20:40:07 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   A /trunk/.pkgmeta.txt

pkgmeta file
------------------------------------------------------------------------
r45 | cielazure | 2012-09-22 20:10:29 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   D /trunk/MSS_Globals.lua
   D /trunk/MSS_Globals.xml
   A /trunk/MasterShapeShifter/MSS_Globals.lua (from /trunk/MSS_Globals.lua:44
   A /trunk/MasterShapeShifter/MSS_Globals.xml (from /trunk/MSS_Globals.xml:44
   A /trunk/MasterShapeShifter/MasterShapeShifter.lua (from /trunk/MasterShapeShifter.lua:44
   A /trunk/MasterShapeShifter/MasterShapeShifter.toc (from /trunk/MasterShapeShifter.toc:44
   A /trunk/MasterShapeShifter/MasterShapeShifter.xml (from /trunk/MasterShapeShifter.xml:44
   A /trunk/MasterShapeShifter/localization.lua (from /trunk/localization.lua:44
   A /trunk/MasterShapeShifter/localization.zhCN.lua (from /trunk/localization.zhCN.lua:44
   A /trunk/MasterShapeShifter/localization.zhTW.lua (from /trunk/localization.zhTW.lua:44
   A /trunk/MasterShapeShifter/localizations.xml (from /trunk/localizations.xml:44
   A /trunk/MasterShapeShifter/textures (from /trunk/textures:44)
   D /trunk/MasterShapeShifter.lua
   D /trunk/MasterShapeShifter.toc
   D /trunk/MasterShapeShifter.xml
   D /trunk/localization.lua
   D /trunk/localization.zhCN.lua
   D /trunk/localization.zhTW.lua
   D /trunk/localizations.xml
   D /trunk/textures

split TalentActionBar to another addon that LoadOnDemand
------------------------------------------------------------------------
r44 | cielazure | 2012-09-22 20:10:01 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   A /trunk/MasterShapeShifter

split TalentActionBar to another addon that LoadOnDemand
------------------------------------------------------------------------
r43 | cielazure | 2012-09-22 20:08:45 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   D /trunk/Bindings.xml
   M /trunk/MSS_Globals.lua
   D /trunk/MSS_TalentBar.lua
   D /trunk/MSS_TalentBar.xml
   M /trunk/MasterShapeShifter.toc

split TalentActionBar to another addon that LoadOnDemand
------------------------------------------------------------------------
r42 | cielazure | 2012-09-22 20:06:59 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   A /trunk/MasterShapeShifter_TalentBar
   A /trunk/MasterShapeShifter_TalentBar/Bindings.xml
   A /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.lua
   A /trunk/MasterShapeShifter_TalentBar/MSS_TalentBar.xml
   A /trunk/MasterShapeShifter_TalentBar/MasterShapeShifter_TalentBar.toc

split TalentActionBar to another addon that LoadOnDemand
------------------------------------------------------------------------
r41 | cielazure | 2012-09-22 18:42:20 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MasterShapeShifter.lua

fix FR formula
------------------------------------------------------------------------
r40 | cielazure | 2012-09-22 11:32:49 +0000 (Sat, 22 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_TalentBar.lua
   M /trunk/MSS_TalentBar.xml
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.lua

fix talent action bar show/hide problem
------------------------------------------------------------------------
r39 | cielazure | 2012-09-21 21:54:36 +0000 (Fri, 21 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_TalentBar.lua
   M /trunk/MasterShapeShifter.lua
   M /trunk/localization.lua

update comments
------------------------------------------------------------------------
r35 | cielazure | 2012-09-21 19:13:20 +0000 (Fri, 21 Sep 2012) | 2 lines
Changed paths:
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml

rewrite the code for aura frame
add cooldown for aura slots
------------------------------------------------------------------------
r34 | cielazure | 2012-09-21 13:19:44 +0000 (Fri, 21 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MSS_TalentBar.lua
   M /trunk/MSS_TalentBar.xml

fix:show/hide talent action bar problem
------------------------------------------------------------------------
r33 | cielazure | 2012-09-21 13:19:07 +0000 (Fri, 21 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml

code improvement for aura frame
------------------------------------------------------------------------
r32 | cielazure | 2012-09-21 08:04:40 +0000 (Fri, 21 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml

Add player/target hp bar with indicator of FR heal
------------------------------------------------------------------------
r30 | cielazure | 2012-09-19 21:27:00 +0000 (Wed, 19 Sep 2012) | 2 lines
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MSS_Globals.xml
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.lua
   M /trunk/localization.zhCN.lua
   M /trunk/localization.zhTW.lua

ui scale
alert for predatory swiftness
------------------------------------------------------------------------
r29 | cielazure | 2012-09-18 20:16:40 +0000 (Tue, 18 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MSS_Globals.xml
   M /trunk/MSS_TalentBar.lua
   M /trunk/MSS_TalentBar.xml
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.lua
   M /trunk/localization.zhCN.lua
   M /trunk/localization.zhTW.lua

add auto-hide while not in combat
------------------------------------------------------------------------
r27 | cielazure | 2012-09-18 13:30:29 +0000 (Tue, 18 Sep 2012) | 1 line
Changed paths:
   M /trunk/localization.lua

update version info
------------------------------------------------------------------------
r26 | cielazure | 2012-09-18 13:29:26 +0000 (Tue, 18 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MSS_Globals.xml
   M /trunk/localization.lua
   M /trunk/localization.zhCN.lua
   M /trunk/localization.zhTW.lua

add options to  enable/disable main frame and/or talentbar
------------------------------------------------------------------------
r25 | cielazure | 2012-09-18 13:13:41 +0000 (Tue, 18 Sep 2012) | 3 lines
Changed paths:
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.zhCN.lua

add spark to power bar.
bug correction
tooltip for reset btn
------------------------------------------------------------------------
r24 | cielazure | 2012-09-18 08:43:08 +0000 (Tue, 18 Sep 2012) | 2 lines
Changed paths:
   M /trunk/MSS_TalentBar.xml
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.lua
   M /trunk/localization.zhCN.lua
   M /trunk/localization.zhTW.lua

correct bug no manabar when first login
change cooldown font type
------------------------------------------------------------------------
r21 | cielazure | 2012-09-17 08:52:25 +0000 (Mon, 17 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.lua

add buff watch
------------------------------------------------------------------------
r19 | cielazure | 2012-09-17 07:57:35 +0000 (Mon, 17 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter.lua

comment update
------------------------------------------------------------------------
r18 | cielazure | 2012-09-17 07:04:45 +0000 (Mon, 17 Sep 2012) | 2 lines
Changed paths:
   D /trunk/beta1

no use

------------------------------------------------------------------------
r17 | cielazure | 2012-09-17 07:03:41 +0000 (Mon, 17 Sep 2012) | 1 line
Changed paths:
   A /trunk/beta1 (from /trunk:13)

beta1
------------------------------------------------------------------------
r13 | cielazure | 2012-09-17 06:52:23 +0000 (Mon, 17 Sep 2012) | 1 line
Changed paths:
   M /trunk/localization.lua

update version
------------------------------------------------------------------------
r9 | cielazure | 2012-09-16 22:09:03 +0000 (Sun, 16 Sep 2012) | 1 line
Changed paths:
   M /trunk/localization.lua

update version info
------------------------------------------------------------------------
r8 | cielazure | 2012-09-16 22:08:11 +0000 (Sun, 16 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml

add buff watch
------------------------------------------------------------------------
r6 | cielazure | 2012-09-16 10:42:58 +0000 (Sun, 16 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.xml
   M /trunk/localization.lua

minor text change
------------------------------------------------------------------------
r5 | cielazure | 2012-09-16 09:56:39 +0000 (Sun, 16 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MSS_TalentBar.lua
   M /trunk/MasterShapeShifter.lua
   M /trunk/localization.lua

bug correction
------------------------------------------------------------------------
r4 | cielazure | 2012-09-16 08:46:08 +0000 (Sun, 16 Sep 2012) | 1 line
Changed paths:
   M /trunk/MSS_Globals.lua
   M /trunk/MSS_Globals.xml
   M /trunk/MasterShapeShifter.lua
   M /trunk/MasterShapeShifter.xml
   M /trunk/localization.lua
   M /trunk/localization.zhTW.lua

bug correction
------------------------------------------------------------------------
r3 | cielazure | 2012-09-15 22:40:26 +0000 (Sat, 15 Sep 2012) | 1 line
Changed paths:
   M /trunk/MasterShapeShifter.toc

update note
------------------------------------------------------------------------
r2 | cielazure | 2012-09-15 22:17:17 +0000 (Sat, 15 Sep 2012) | 1 line
Changed paths:
   A /trunk/Bindings.xml
   A /trunk/MSS_Globals.lua
   A /trunk/MSS_Globals.xml
   A /trunk/MSS_TalentBar.lua
   A /trunk/MSS_TalentBar.xml
   A /trunk/MasterShapeShifter.lua
   A /trunk/MasterShapeShifter.toc
   A /trunk/MasterShapeShifter.xml
   A /trunk/localization.lua
   A /trunk/localization.zhCN.lua
   A /trunk/localization.zhTW.lua
   A /trunk/localizations.xml
   A /trunk/textures
   A /trunk/textures/BarTextureSmooth.tga

init import
------------------------------------------------------------------------
r1 | svn | 2012-09-15 21:34:42 +0000 (Sat, 15 Sep 2012) | 1 line
Changed paths:
   A /branches
   A /tags
   A /trunk

mastershapeshifter/mainline: Initial Import
------------------------------------------------------------------------