FMudanyali/FreeGLUT-Vita
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
FreeGLUT library ported to PS Vita using Pigs-In-A-Blanket
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.
1,857 Commits 1 Branch 0 Tags 6.8 MiB
C 97.2%
CMake 2%
C++ 0.8%
0d2407012c
Go to file
Diederick Niehorster 0d2407012c Merge remote-tracking branch 'svn/trunk' into git_master
2016-01-20 20:49:16 +01:00
freeglut fixing up some docs regarding spaceball buttons 2016-01-20 20:45:48 +01:00
.gitattributes added handy upload script which uses rsync to copy all modified files 2015-03-12 19:53:32 +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.