Clean up more cruft from conflict
Clean up more cruft from conflict

cledio66/pyglet,odyaka341/pyglet,odyaka341/pyglet,kmonsoor/pyglet,arifgursel/pyglet,shaileshgoogler/pyglet,cledio66/pyglet,mpasternak/michaldtz-fix-552,Alwnikrotikz/pyglet,mpasternak/michaldtz-fixes-518-522,xshotD/pyglet,gdkar/pyglet,gdkar/pyglet,Austin503/pyglet,Austin503/pyglet,Austin503/pyglet,Alwnikrotikz/pyglet,mpasternak/pyglet-fix-issue-552,mpasternak/michaldtz-fixes-518-522,shaileshgoogler/pyglet,mpasternak/pyglet-fix-issue-552,gdkar/pyglet,kmonsoor/pyglet,Austin503/pyglet,kmonsoor/pyglet,arifgursel/pyglet,arifgursel/pyglet,cledio66/pyglet,kmonsoor/pyglet,mpasternak/michaldtz-fixes-518-522,gdkar/pyglet,arifgursel/pyglet,xshotD/pyglet,mpasternak/pyglet-fix-issue-552,odyaka341/pyglet,google-code-export/pyglet,xshotD/pyglet,Alwnikrotikz/pyglet,odyaka341/pyglet,mpasternak/michaldtz-fix-552,mpasternak/michaldtz-fixes-518-522,Alwnikrotikz/pyglet,cledio66/pyglet,shaileshgoogler/pyglet,google-code-export/pyglet,google-code-export/pyglet,Austin503/pyglet,google-code-export/pyglet,Alwnikrotikz/pyglet,google-code-export/pyglet,qbektrix/pyglet,mpasternak/pyglet-fix-issue-518-522,shaileshgoogler/pyglet,qbektrix/pyglet,cledio66/pyglet,kmonsoor/pyglet,mpasternak/pyglet-fix-issue-518-522,mpasternak/pyglet-fix-issue-552,mpasternak/pyglet-fix-issue-518-522,xshotD/pyglet,mpasternak/michaldtz-fix-552,arifgursel/pyglet,odyaka341/pyglet,gdkar/pyglet,mpasternak/michaldtz-fix-552,qbektrix/pyglet,mpasternak/pyglet-fix-issue-518-522,qbektrix/pyglet,qbektrix/pyglet,xshotD/pyglet,shaileshgoogler/pyglet