Remove unnecessary X includes for Bug #20

nickguletskii / GLXOSD

GLXOSD is an extensible on-screen display (OSD)/overlay for OpenGL applications running on Linux with X11 which aims to provide similar functionality to MSI Afterburner/RivaTuner OSD. It can show FPS, frame timings, temperatures and more in OpenGL games and applications. It can also be used to benchmark games, much like voglperf.

https://glxosd.nickguletskii.com

MIT License

124 stars 20 forks source link

Remove unnecessary X includes for Bug #20 #38

Closed ghost closed 9 years ago

ghost commented 9 years ago

Remove unnecessary X includes to workaround "#define None" clash with boost-xpressive < 1.53 (Bug #20)

More details on https://github.com/nickguletskii/GLXOSD/issues/20#issuecomment-138106030

nickguletskii commented 9 years ago

Could you please change your pull requests to merge into development? I am going to check them out right now. Sorry for the late responses.

ghost commented 9 years ago

I can't change the target branch on an existing pull request. Would have to close them all and re-submit. Should I do that?

You can merge PRs into whatever branch you like. Don't feel restrained by github's UI.

If I may suggest, having master == development is the more common workflow. For releases, you can create separate branches/tags, this way you can also push hotfixes into a past release without affecting the current dev branch.

ghost commented 9 years ago

Merged into development branch, closing.