src: Resolve merge conflict

This commit is contained in:
Jordan O'Leary 2023-03-25 17:03:40 -04:00
parent aa3f77d736
commit 552e5ad800

View File

@ -55,6 +55,11 @@ pub fn build(b: *Builder) void {
.path = "examples/textures/sprite_anim.zig", .path = "examples/textures/sprite_anim.zig",
.desc = "Animate a sprite", .desc = "Animate a sprite",
}, },
.{
.name = "texture_outline",
.path = "examples/shaders/texture_outline.zig",
.desc = "Uses a shader to create an outline around a sprite",
}
// .{ // .{
// .name = "models_loading", // .name = "models_loading",
// .path = "examples/models/models_loading.zig", // .path = "examples/models/models_loading.zig",