projects
/
TDDC76_proj.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
545ebb2
)
fixade en konflikt i testfilen
author
lukel495
<lukel495@su00-101.ad.liu.se>
Sat, 11 Nov 2023 14:34:50 +0000
(15:34 +0100)
committer
lukel495
<lukel495@su00-101.ad.liu.se>
Sat, 11 Nov 2023 14:34:50 +0000
(15:34 +0100)
src/_test.cc
patch
|
blob
|
history
diff --git
a/src/_test.cc
b/src/_test.cc
index bffea2478bfa8fe54513a7c2b3dcfdb88c3c0c0b..67ed969b0e4cae115f67be83d438413c490fd0f9 100644
(file)
--- a/
src/_test.cc
+++ b/
src/_test.cc
@@
-34,7
+34,7
@@
int main()
/* ladda in en texture (bild) */
Texture texture;
- if (!texture.loadFromFile("4V_figur2.png"))
+ if (!texture.loadFromFile("
assets/
4V_figur2.png"))
{
// gick inte att ladda bilden
return 1;