[opengl] merge (part 2)

2011-03-16 23:35:47 -07:00
parent 0c457ba55b
commit 53865866d3
2 changed files with 2 additions and 4 deletions
@@ -1567,5 +1567,3 @@ void HandleInputEvents(float fDeltaTime)
 * OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 * PERFORMANCE OF THIS SOFTWARE.
 */
-
->>>>>>> other