History

resolve conflicts on merge with upstream master

Stephen Birarda committed 13 years ago

Commit 53108b01 parent 1dd21a41 file · +2 −2Browse files

Showing the changes to interface/src/main.cpp (1 of 1 file). Show all

Unified · Split

interface/src/main.cpp+2−2
@@ -354,8 +354,8 @@ void reset_sensors() · 353 unmodified lines
354354 //
355355 myAvatar.setRenderYaw(startYaw);
356356
357− yaw = renderYawRate = 0;
358− pitch = renderPitch = renderPitchRate = 0;
357+ renderYawRate = 0;
358+ renderPitchRate = 0;
359359 myAvatar.setBodyPosition(start_location);
360360 headMouseX = WIDTH/2;
361361 headMouseY = HEIGHT/2;

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t