Merge branch 'master' of harrygodden.com:/home/fishladder

Former-commit-id: 2224e74bdfc8e19a2de99645246daf671d4323b4

diff --git a/.gitignore b/.gitignore
index a3255d6ded6db7217a015542dd97b85cff17e231..379dcb07d5b28793ecca1abcf2bd7e25c0aa79f1 100755 (executable)
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,8 @@
 *
 !*/
 
-./build.linux
-./cglm
+build.linux/
+cglm/
 
 # ALLOW ============================
 !.gitattributes

diff --git a/build.sh.REMOVED.git-id b/build.sh.REMOVED.git-id
index 57f7702d7edaa02db77fe58c7eb2499915bd3a7c..0256e1e0c439a8ec6a7cdb92f574bf311fc5d3a8 100644 (file)
--- a/build.sh.REMOVED.git-id
+++ b/build.sh.REMOVED.git-id
@@ -1 +1 @@
-bd7ec513d5f8550a3980bd05d7107f06420c0672
\ No newline at end of file
+2ce525a1cac803535b4d038cb65e2df3d356047c
\ No newline at end of file

diff --git a/fishladder.c.REMOVED.git-id b/fishladder.c.REMOVED.git-id
index 1481a2faca6c35153d4ab8ae847a65a249e4ecb9..410d1d3b0bd1e2ef599787a87e6e5308a505be0d 100644 (file)
--- a/fishladder.c.REMOVED.git-id
+++ b/fishladder.c.REMOVED.git-id
@@ -1 +1 @@
-af6a2a3d68f995dc2dac2e20892fdf00d058d40a
\ No newline at end of file
+ec571afe730d8fc0376cc5f62d849abee106948c
\ No newline at end of file

diff --git a/stb/stb_image.h.REMOVED.git-id b/stb/stb_image.h.REMOVED.git-id
new file mode 100644 (file)
index 0000000..3eff611
--- /dev/null
+++ b/stb/stb_image.h.REMOVED.git-id
@@ -0,0 +1 @@
+0f8459a7998d5ffd87d313e3f6d16e2b45b6e697
\ No newline at end of file

diff --git a/textures/rivertiles_flowm.tga.REMOVED.git-id b/textures/rivertiles_flowm.tga.REMOVED.git-id
new file mode 100644 (file)
index 0000000..084029d
--- /dev/null
+++ b/textures/rivertiles_flowm.tga.REMOVED.git-id
@@ -0,0 +1 @@
+624502d7f85ebb40989d70a1979fe5286124a7b1
\ No newline at end of file

diff --git a/textures/rivertiles_ripple.tga.REMOVED.git-id b/textures/rivertiles_ripple.tga.REMOVED.git-id
new file mode 100644 (file)
index 0000000..1fb816f
--- /dev/null
+++ b/textures/rivertiles_ripple.tga.REMOVED.git-id
@@ -0,0 +1 @@
+b4a2442d44f40d4e1c799186cc31e4f09d1eaff9
\ No newline at end of file

diff --git a/vg/vg.c b/vg/vg.c
deleted file mode 100644 (file)
index e69de29..0000000

diff --git a/vg/vg.h.REMOVED.git-id b/vg/vg.h.REMOVED.git-id
index fc3b3bc73ba7977ef8299b06d7b63d6b22c984d4..0b5790f20c3d1ba8bf203930c20ad935d9c9e039 100644 (file)
--- a/vg/vg.h.REMOVED.git-id
+++ b/vg/vg.h.REMOVED.git-id
@@ -1 +1 @@
-512c9a39defb6808ef31ebc6f8cd173d38cc6e13
\ No newline at end of file
+9e012af56c4f97bbfe128119bd28693a308e1fd8
\ No newline at end of file

diff --git a/vg/vg_tex.h.REMOVED.git-id b/vg/vg_tex.h.REMOVED.git-id
new file mode 100644 (file)
index 0000000..ca5bbaf
--- /dev/null
+++ b/vg/vg_tex.h.REMOVED.git-id
@@ -0,0 +1 @@
+742493b5720d8bfc4a873f864c9b209deb3ecee8
\ No newline at end of file