Code

Fix merge conflict#693

Code

Open

nickretallack wants to merge 5 commits intooctalmage:masteroctalmage/robotjs:masterfrom cryptagon:fix-merge-conflictcryptagon/robotjs:fix-merge-conflictCopy head branch name to clipboard

+3,635-1,502

Commits

Commits on May 26, 2021

• uses signed coordinates for mouse events

  gerhardberger

  committed
  a5a9b2c

• updates deps

  gerhardberger

  committed
  a003d71

• fixes signed return value on other platforms

  gerhardberger

  committed
  5fe7ddf

Commits on Oct 7, 2021

• Merge remote-tracking branch 'teamaround/master'

  

  Tim Su

  committed
  07987f8

Commits on Oct 8, 2021

• fix merge conflict

  nickretallack

  committed
  38efab6