Archived

FreeGLUT library ported to PS Vita using Pigs-In-A-Blanket

freeglut gles2 glut psvita psvita-homebrew team-cbps

This repository has been archived on 2024-06-25. You can view files and clone it, but cannot push or open issues or pull requests.

Go to file

Diederick Niehorster 3ff4c1e72b Merge branch 'trunk' into git_master		2014-10-17 01:45:59 +08:00
freeglut	be more careful about closing menus when focus changes. Only do so when new focus window is not ANY of the open menus and when it is not the menu's parent window (all open menus are guaranteed to have the same parent in my reading of the code)	2014-10-16 17:43:22 +00:00
.gitattributes	Unify GLES1 and GLES2 (libraries are compatible and can be co-linked)	2014-06-01 09:24:47 +00:00
.gitignore	Android: unify toolchain and module builds	2012-05-04 11:17:43 +00:00
README.md	Creade readme for git repo on github.	2014-01-16 10:06:31 +08:00

README.md

FreeGLUT

This readme file applies to the git clone of FreeGLUT's svn repo on sourceforge.net that is hosted on github. This is provided here to enable user to contribute easier.

Every effort is made to ensure that the git_master branch only progresses in a fastforward manner, but complete guarantees cannot be given as the sourceforge.net trunk is at all times leading.

This copy of the svn repository was not created with git svn but with the excellent svn support of SmartGit. Basic workflow upon receiving a pull request is as follows:

Merge pull request on github
pull in changes to my local clone of the git_master branch.
cherry pick the merged commits onto my local clone of the svn/trunk branch
push these commits to svn remote (this alters the commits in the local svn/trunk clone as extra meta data is added)
merge svn/trunk into local git_master
push merge commit to github (its fast forward!)

I will be unable to merge a pull request if the github clone is behind svn/trunk on srouceforge.net. Should you detect this, please contact me, maybe through making an issue here on github.