Skip to content

Commit

Permalink
Merge branch 'master' into cmake
Browse files Browse the repository at this point in the history
  • Loading branch information
JarrettSJohnson committed May 11, 2024
2 parents 9c98253 + 195f4d1 commit 1dcd510
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 1 deletion.
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name: CI

on: [push]
on: [push, pull_request]

jobs:
build:
Expand Down
1 change: 1 addition & 0 deletions layer1/CGO.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ Z* -------------------------------------------------------------------
#include <set>
#include <glm/vec3.hpp>
#include <glm/vec4.hpp>
#include <cstdint>

/* Compiled Graphics Library for simple graphics objects
in floating point three-space, with the goal of achieving
Expand Down

0 comments on commit 1dcd510

Please sign in to comment.