Skip to content

Commit

Permalink
Merge branch 'master' into cheneym2/slang_issue_4124
Browse files Browse the repository at this point in the history
  • Loading branch information
cheneym2 authored Oct 29, 2024
2 parents 621b8bb + 6367d40 commit 137cc88
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion source/slang-wasm/slang-wasm.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
#include "../core/slang-exception.h"
#include "../slang/slang-language-server.h"

#include <slang-com-ptr.h>
#include <slang.h>
#include <string>
#include <vector>
Expand Down
1 change: 1 addition & 0 deletions source/slang-wasm/slang-wasm.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
#include <emscripten/val.h>
#include <slang.h>
#include <unordered_map>
#include <slang-com-ptr.h>

namespace Slang
{
Expand Down

0 comments on commit 137cc88

Please sign in to comment.