]> git.xonotic.org Git - xonotic/darkplaces.git/commit
fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD
authorRudolf Polzer <divverent@xonotic.org>
Wed, 2 Nov 2011 11:08:52 +0000 (12:08 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 2 Nov 2011 11:08:52 +0000 (12:08 +0100)
commitc9cf1669fc885cecb6b7a82fd86b17df9b965486
tree980ac37839bc687db2f75f56f4aa8fd2ed09ba65
parentbbb146099f0725669812b5d701dd8e70f68e769e
fix a merge resolution failure in a previous cherry-pick: Sys_SysOpenFD -> FS_SysOpenFD
fs.c