Skip to content

Commit

Permalink
sgeo-7.1.10 alternate strategy 2.4
Browse files Browse the repository at this point in the history
  • Loading branch information
humbletim committed Oct 13, 2024
1 parent 15a1736 commit 54bcc42
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion sgeo-7.1.10/VR_Sgeo_2024.7.1.10.mergeconflict-fixes.patch
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ diff -ur --binary '--exclude=.git' ../Firestormx/indra/llrender/llrendertarget.h
U32 getFBO();
// END P373R Sgeo

- U32 getDepth(void) const { return mDepth; }
- U32 getDepth(void) const { return mDepth; }
->>>>>>> sgeo/VR_Sgeo_2024

U32 getDepth(void) const { return mDepth; }
Expand Down

0 comments on commit 54bcc42

Please sign in to comment.