1
edit
Changes
→Questions
PROFILE_GEN_CFLAGS=”-GL”
PROFILE_GEN_LDFLAGS=”-LTCG:PGINSTRUMENT”</pre>
===How to pull new changes for mouselock===
1. Copy the repo URL in git hub
2. git remote add <repo name> git://<url>
3. git checkout master, pull to master first to avoid conflict
4. git pull <repo name>/master
5. git checkout mouselock, change to mouse lock to merge with our up to date master.
6. git merge master
To fix a merge conflict
1. git status, to see what files have an issue
2. git add <file>, fix then add those files
3. git commit
