)]}'
{
  "commit": "583c10571c451b55481a1bfb54420b9a7c73d34d",
  "tree": "5a8c10589d199ad7c291cf4d887e8dc97ff70dd0",
  "parents": [
    "b2160fb51ec2bd59ecb96d083c6f31551f225c34"
  ],
  "author": {
    "name": "rivessamr",
    "email": "hello@rive.app",
    "time": "Fri Aug 23 21:55:37 2024 +0000"
  },
  "committer": {
    "name": "rivessamr",
    "email": "hello@rive.app",
    "time": "Fri Aug 23 21:55:37 2024 +0000"
  },
  "message": "Pushing merge, resolved using upstream.\\n\\n message\u003dFix actions yaml with rive-renderer\n\nFix actions yaml with rive-renderer instead of cpp\n\nDiffs\u003d\n21ecf2775 Fix actions yaml with rive-renderer (#7930)\nc33d5d81b Update rive renderer readme (#7929)\nb03895fcf Update pls README (#7927)\n3316d15ca Refactor pls into runtime (#7914)\n\nCo-authored-by: Chris Dalton \u003c99840794+csmartdalton@users.noreply.github.com\u003e\nCo-authored-by: rivessamr \u003csuki@rive.app\u003e diff\u003d\\n\\ndiff --cc pls/README.md\nindex 1f4232bd,272c7360..00000000\n--- a/pls/README.md\n+++ b/pls/README.md\n@@@ -2,21 -2,21 +2,37 @@@\n\n  The Rive Renderer is a vector and raster graphics renderer custom-built for Rive content, for animation, and for runtime.\n\n++\u003c\u003c\u003c\u003c\u003c\u003c\u003c ours\n +This repository contains the renderer code and an example for how to interface with it directly. The code within this repository does not contain a Rive runtime. It contains the best in class concrete implementation of Rive\u0027s rendering abstraction layer, which we call the Rive Renderer.\n +\n +## Clone this repo\n +\n +Make sure to clone this repo with submodules!\n +\n +```\n +git clone --recurse-submodules git@github.com:rive-app/rive-renderer.git\n++\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n+ This folder contains the renderer code and an example for how to interface with it directly. It contains the best in class concrete implementation of Rive\u0027s rendering abstraction layer, which we call the Rive Renderer.\n+\n+ ## Clone the rive-runtime repo\n+\n+ ```\n+ git clone https://github.com/rive-app/rive-runtime.git\n+ cd rive-runtime/pls\n++\u003e\u003e\u003e\u003e\u003e\u003e\u003e theirs\n  ```\n\n  ## Build GLFW\n\n  ```\n++\u003c\u003c\u003c\u003c\u003c\u003c\u003c ours\n +cd submodules/rive-cpp/skia/dependencies\n +./make_glfw.sh\n++\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n+ pushd ../skia/dependencies\n+ ./make_glfw.sh\n+ popd\n++\u003e\u003e\u003e\u003e\u003e\u003e\u003e theirs\n  ```\n\n  ## Install Python PLY\n@@@ -28,7 -28,7 +44,11 @@@ python3 -m pip install pl\n  ## Add build_rive.sh to $PATH\n\n  ```\n++\u003c\u003c\u003c\u003c\u003c\u003c\u003c ours\n +export PATH\u003d\"$PATH:$(pwd)/submodules/rive-cpp/build\"\n++\u003d\u003d\u003d\u003d\u003d\u003d\u003d\n+ export PATH\u003d\"$PATH:$(realpath ../build)\"\n++\u003e\u003e\u003e\u003e\u003e\u003e\u003e theirs\n  ```\n\n  ## Build \u0026 run\n",
  "tree_diff": [
    {
      "type": "modify",
      "old_id": "f1c6c3be3eb6156221404e857f10e898809fca00",
      "old_mode": 33188,
      "old_path": ".rive_head",
      "new_id": "56395e4758b3e37677cefd7b5222d953b66bbfdb",
      "new_mode": 33188,
      "new_path": ".rive_head"
    },
    {
      "type": "modify",
      "old_id": "1f4232bd51212cbe968714fd731a553f8e9c606e",
      "old_mode": 33188,
      "old_path": "pls/README.md",
      "new_id": "272c736098c77753b09a6cf520e6b23b2902cbdf",
      "new_mode": 33188,
      "new_path": "pls/README.md"
    }
  ]
}