0000000000000000000000000000000000000000 705660d04706e1a3d7978f40a826f8824452aa40 Michael P. Starkweather <mpstark@gmail.com> 1414687827 -0500	branch: Created from master
705660d04706e1a3d7978f40a826f8824452aa40 747245d719a482cd0b71e7b77cec276ae546dc15 Michael P. Starkweather <mpstark@gmail.com> 1414688556 -0500	merge master: Fast-forward
747245d719a482cd0b71e7b77cec276ae546dc15 9f9ed1afcd9d0ff7bcfd2f1ee6340456a4cb3193 Michael P. Starkweather <mpstark@gmail.com> 1414699197 -0500	commit: Add options to menu to configure cooldowns feature
9f9ed1afcd9d0ff7bcfd2f1ee6340456a4cb3193 d2283c4c9ba7c0a47e410bd6b758110e5c9ee2be Michael P. Starkweather <mpstark@gmail.com> 1414729520 -0500	merge master: Merge made by the 'recursive' strategy.
d2283c4c9ba7c0a47e410bd6b758110e5c9ee2be d2283c4c9ba7c0a47e410bd6b758110e5c9ee2be Michael P. Starkweather <mpstark@gmail.com> 1414737563 -0500	Branch: renamed refs/heads/Cooldowns to refs/heads/Cooldowns/Modularization
d2283c4c9ba7c0a47e410bd6b758110e5c9ee2be d2283c4c9ba7c0a47e410bd6b758110e5c9ee2be Michael P. Starkweather <mpstark@gmail.com> 1414737588 -0500	Branch: renamed refs/heads/Cooldowns/Modularization to refs/heads/Cooldowns+Modularization
d2283c4c9ba7c0a47e410bd6b758110e5c9ee2be 3840f53b8443cff77af728809d198a92ee025dd6 Michael P. Starkweather <mpstark@gmail.com> 1414889685 -0500	commit: Some internal cleanup and reorganization, of which there is more coming since I just read more about Lua metatables. Mmmm
3840f53b8443cff77af728809d198a92ee025dd6 09ec747fcfc7a0a7108784cae2689bb4ec0f5f37 Michael P. Starkweather <mpstark@gmail.com> 1414889704 -0500	merge master: Merge made by the 'recursive' strategy.
09ec747fcfc7a0a7108784cae2689bb4ec0f5f37 e798be6188cbf81409e47dcbba8121d707970d00 Michael P. Starkweather <mpstark@gmail.com> 1414989937 -0600	commit: Update new frame stuff when changing stuff in menu -- doesn't work quite right yet.
e798be6188cbf81409e47dcbba8121d707970d00 28d9067da7059738a49303a20287acd009a3407f Michael P. Starkweather <mpstark@gmail.com> 1415037860 -0600	merge master: Merge made by the 'recursive' strategy.
28d9067da7059738a49303a20287acd009a3407f c7e1f13cd23c015786f245044a82fee09ea6983a Michael P. Starkweather <mpstark@gmail.com> 1415048545 -0600	commit: Renamed Filter.lua and Display.lua to fit the new organization.
c7e1f13cd23c015786f245044a82fee09ea6983a ae4bdb526382f3f9623fe3b82adf9842fad2e92d Michael P. Starkweather <mpstark@gmail.com> 1415070440 -0600	commit: First attempt at getting the new system to work. Still needs to get the kinks worked out of it.
ae4bdb526382f3f9623fe3b82adf9842fad2e92d 4108d2431e17c4a16d9904688625cbc603154bfd Michael P. Starkweather <mpstark@gmail.com> 1415086519 -0600	commit: Metatables are mostly working, need to track down why it isn't working yet.
4108d2431e17c4a16d9904688625cbc603154bfd 87c7ac775b0dba7b0f2582100a910ed90c159ebf Michael P. Starkweather <mpstark@gmail.com> 1415156740 -0600	commit: Finally have a semi-working version of the new, new, structure. Has a horrible memory leak right now.
87c7ac775b0dba7b0f2582100a910ed90c159ebf 549b9b6e1f03e897fd9d972e949304e8955b1291 Michael P. Starkweather <mpstark@gmail.com> 1415376479 -0600	commit: Fix issue with multiple filters of the same type.
549b9b6e1f03e897fd9d972e949304e8955b1291 d7ba04e4c3cd37961c49fe31c9c0e8fd61361da9 Michael P. Starkweather <mpstark@gmail.com> 1415382971 -0600	commit (merge): Merge branch 'master' into Cooldowns+Modularization
d7ba04e4c3cd37961c49fe31c9c0e8fd61361da9 979eefe87e84c602e89405d57f41e25e4711fe69 Michael P. Starkweather <mpstark@gmail.com> 1415384171 -0600	commit: Fixed merge error
979eefe87e84c602e89405d57f41e25e4711fe69 fdd272af4192a035763e308fcdc8120234e695ff Michael P. Starkweather <mpstark@gmail.com> 1415384264 -0600	commit: Make sure that classification filters are still able to be added.
fdd272af4192a035763e308fcdc8120234e695ff 8c42eed35557d77a961a57aac920d2383899c28a Michael P. Starkweather <mpstark@gmail.com> 1415397753 -0600	commit: Work on getting old functionality back.
8c42eed35557d77a961a57aac920d2383899c28a f9cec8dc37e9badf910d10a78cefdc7913dbd87f Michael P. Starkweather <mpstark@gmail.com> 1415587169 -0600	merge master: Merge made by the 'recursive' strategy.
f9cec8dc37e9badf910d10a78cefdc7913dbd87f 12de1e3c71570455465e9746dca267c0c24cf070 Michael P. Starkweather <mpstark@gmail.com> 1415589677 -0600	commit: Small tweaks to when the frame is shown/hidden.
12de1e3c71570455465e9746dca267c0c24cf070 79e86eef633e70f163655add40a64c465dded661 Michael P. Starkweather <mpstark@gmail.com> 1415596627 -0600	commit: Fix for executes showing up.
79e86eef633e70f163655add40a64c465dded661 3b9a4263492aff50f497d687ca2d97a1eff1dd2f Michael P. Starkweather <mpstark@gmail.com> 1415783454 -0600	commit: Make sure to render the frame when an icon is removed as well.
3b9a4263492aff50f497d687ca2d97a1eff1dd2f 48711eaff99957490ed3757c6413b46811a7b85b Michael P. Starkweather <mpstark@gmail.com> 1415843538 -0600	commit (merge): Merge branch 'master' into Cooldowns+Modularization
48711eaff99957490ed3757c6413b46811a7b85b 6d2c7aa2e3ec790bf7008629c4d6fc283f8f19e3 Michael P. Starkweather <mpstark@gmail.com> 1415849429 -0600	commit: Rewrite stacking for new frame again, not perfect yet
6d2c7aa2e3ec790bf7008629c4d6fc283f8f19e3 1d8dccc0c77f3c141a477fed9b7365df78031e2d Michael P. Starkweather <mpstark@gmail.com> 1469215434 -0500	commit: No idea what these changes are, I haven't worked on this in a year
