WowAce

commit e927a2a0add4f2c18060a503fb129f5f983b69f5
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Oct 9 23:16:16 2008 +0200

    add Deathknight to classchoices for triggers

commit 8be5238cc960a7457c4e14789fdb9a8c17f24391
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Oct 9 21:37:33 2008 +0200

    merge with changes in kilroggs wotlk-branch

commit 3ffe143cca1146e9e55b91056838095cc976cb08
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Oct 9 21:13:13 2008 +0200

    fix last conflict

commit 069b6d0c64aec7625547f8ac1ab215f100fb4523
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Oct 9 21:11:58 2008 +0200

    fix conflicts

commit 3eb9436b39b04a028b9dbdb806b4c61037c07bc1
Merge: 72f90da... 5843fd6...
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Oct 9 21:09:36 2008 +0200

    merge with master
    
    Merge branch 'master' into WotLK
    
    Conflicts:
    
        Code/Display.lua
        Code/Triggers.lua
        Data/Cooldowns.lua

commit 5843fd6047b15ac20c5b0b961e81634144f60614
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Oct 9 21:01:04 2008 +0200

    merged with new wowace-svn

commit 72f90da990a394dd9995eecba62752d092eccc8d
Merge: aac6a70... 18cadad...
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Sep 12 20:02:01 2008 +0200

    Merge branch 'master' into WotLK

commit 18cadadd6e474eb28367114dc1442f8cb245f165
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 26 19:54:18 2008 +0200

    Parrot:
    revert that Aura-refresh-fix that broke buff-fades

commit df226d5aa14cad5893f5b0b5fdfe93817aad1146
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 26 19:49:21 2008 +0200

    add newline at end of file

commit aac6a707d8ec03ada7adb12d6b69f747f53b7438
Merge: b99e25e... 5c9cff1...
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 26 19:47:30 2008 +0200

    merge trunk-fixes
    
    Merge branch 'master' into WotLK

commit 5c9cff1e8d290b5dfff5ca3eee0be4026d35ed5e
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 26 19:46:52 2008 +0200

    spell-ready-fix
    merge svn-trunk

commit 06fbf537f69b99113e34b052b0f67bac7af68772
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 26 19:39:37 2008 +0200

    Revert "add Spell-usable-condition"
    
    This reverts commit 8b3a94640ea12533c2da74c98319e3dbdecf0956.

commit 8b3a94640ea12533c2da74c98319e3dbdecf0956
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 26 19:38:25 2008 +0200

    add Spell-usable-condition
    make riposte work

commit b99e25e2921dfa3637e0a056356bae02330eab80
Merge: 4560380... 25d4369...
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 20 20:35:47 2008 +0200

    merge aura-trigger-fix
    
    Merge branch 'master' into WotLK

commit 25d4369bb3fc45137bd2d061de837997a917b53b
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 20 20:23:20 2008 +0200

    fix aura-triggers

commit c4742496c3d8a4df1c899656138b1f547bc76b87
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Aug 15 20:10:24 2008 +0200

    fix in uid-calculation for triggers

commit 341282c1d93cd1f4975d4fd30d46794c71d7c144
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Aug 15 16:21:20 2008 +0200

    uid-calculation-tweak

commit e0aa325f3299f27bffe448dd283abedd3b99db22
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Aug 15 15:17:14 2008 +0200

    cleanup

commit 865297b403fe401d1738153cfba2e12bbb1f6ba1
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Aug 15 14:36:43 2008 +0200

    typo fix

commit 31dd69e006b9e2c4cadfcd524caea135835a1149
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Aug 15 13:50:27 2008 +0200

    Trigger-system-tweak

commit 7c698268ba04fbeadec1c69c582189810de9ee17
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 14:16:02 2008 +0200

    Execute-Trigger 20%->19% life-percent

commit 4560380287aa2555df7f692f67170b37c8042524
Merge: 4e015ca... 40d8328...
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 13:46:44 2008 +0200

    merge in new Animation-styles Sprnkler2, Angled2
    
    Merge branch 'master' into WotLK

commit 40d8328e9b64f2b8f3bdfd5460c506193ab2d372
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 13:45:45 2008 +0200

    add Angled2 (Angled w/o the shaking)

commit 9be99416b57ec65854130ec1d697ec02098729b8
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 13:24:39 2008 +0200

    typo-fix in Petheals

commit ad1beb32add9dfd73420d60dba04d25615574e54
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 13:24:07 2008 +0200

    fix sprinkler2

commit 4e015ca3f1da1b8fc2cb85c37ecc73244a02e5e6
Merge: e101aec... 7bb4277...
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:37:33 2008 +0200

    Merge branch 'master' into WotLK

commit 7bb4277b8fc5a06b982dfb10819dfb8e5b6d89cb
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:36:14 2008 +0200

    add animationstyle Sprinkler2 (without the shaking)

commit e101aec6e096a60d5228604660ae8232b6937822
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:30:20 2008 +0200

    Revert "Revert "merged Cooldowns.lua""
    
    This reverts commit fae3a0af038f2c48c6720b90246557e1e4973342.

commit fae3a0af038f2c48c6720b90246557e1e4973342
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:29:52 2008 +0200

    Revert "merged Cooldowns.lua"
    
    This reverts commit 8b10c8b726c52a5e314a24963e26d97743d29dc3.

commit fbc8f89034afce4ac1a1aab429c40d5a4d5a4bad
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:21:15 2008 +0200

    merge the rest

commit 8b10c8b726c52a5e314a24963e26d97743d29dc3
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:14:32 2008 +0200

    merged Cooldowns.lua

commit 739934c294ddc9c5802471afcfb34a83b8f92def
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Wed Aug 13 12:09:42 2008 +0200

    merged CombatEvents.lua

commit 1e55858e1fe04fba3e26b7b21f249cb44785392a
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 12 19:22:34 2008 +0200

    stop petheal from showing as outgoing heal

commit 3b9e4a6e53deb8bba15dd8cd3eb14271eb7a4c45
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 12 19:20:31 2008 +0200

    fix pet-heal showing up twice
    fix "pet heal over time" showing up in wrong category in options

commit e5e8c57211c5c96f672d88e2a49149e75217ccb5
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Tue Aug 12 19:08:34 2008 +0200

    fix issue with nil-damagetypes

commit 5f5d6239903d6c8e4f280553b1c62a891d957deb
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Fri Aug 1 22:00:13 2008 +0200

    prevent selfdamage from showing in Outgoing

commit 50850410ef489e0683b9d36ae6815bf3bb5ea9ed
Author: profalbert <profalbert@profalbert-laptop.(none)>
Date:   Thu Jul 31 12:28:13 2008 +0200

    init