Closed lostname420 closed 5 years ago
Since you're probably having to do this merge manually, you might want to remove x264 because it just shut down :-/
Fixed the conflict.
I will never have anything merged automatically due to the fact that any updates to this script will be deployed to many users just as automatically. I definitely appreciate you being patient while I deal with other things though.
Fixed PTF search which was accidentally merged earlier. It works correctly now with the %search_string%. Added ANT search via %search_string%. Added Google search for easy access to images.
I'm not sure why these aren't able to be merged automatically. Is it too many edits at once? I've tested and all of the additions work. Maybe you could let me know the issue if you find it.
Cheers!