From 585d7bfdeea4b40cb54ab74f55b043f56a702c3c Mon Sep 17 00:00:00 2001
From: dcnieho
Date: Wed, 26 Apr 2017 08:45:26 +0000
Subject: [PATCH 1/3] Added templates
(cherry picked from commit a83772981f866143a8c2aca8a1d221f67cb9ca13)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1797 7f0cb862-5218-0410-a997-914c9d46530a
---
.github/PULL_REQUEST_TEMPLATE.md | 5 +++++
.github/issue_template.md | 13 +++++++++++++
2 files changed, 18 insertions(+)
create mode 100644 .github/PULL_REQUEST_TEMPLATE.md
create mode 100644 .github/issue_template.md
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
new file mode 100644
index 0000000..a02656c
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,5 @@
+Thank you for submitting a pull request, it's much appreciated.
+
+Because this is a mirror repo, we may not respond to or merge the PR in the timely manner you may expect.
+
+One way to get more attention to your issue is to message our mailing list: `freeglut-developer at lists.sourceforge.net`
\ No newline at end of file
diff --git a/.github/issue_template.md b/.github/issue_template.md
new file mode 100644
index 0000000..d77d1e4
--- /dev/null
+++ b/.github/issue_template.md
@@ -0,0 +1,13 @@
+Thank you for submitting an issue, it's much appreciated.
+
+Couple points before you create this ticket:
+
+* Because this is a mirror repo, we may not respond to new issues in the timely manner you may expect.
+* Our official Bug/Issue list is located [here](https://sourceforge.net/p/freeglut/bugs/). If you create a duplicate issue in the official list in addition to GitHub, please reference the GitHub and SourceForge tickets in the other site's ticket so we may close both tickets.
+* There is also an official Feature Request list, located [here](https://sourceforge.net/p/freeglut/feature-requests/).
+* One way to get more attention to your issue is to message our mailing list: `freeglut-developer at lists.sourceforge.net`
+
+If you still intend to make a ticket here, please provide the following:
+
+* OS
+* FreeGLUT version
\ No newline at end of file
From 474975bc41652fdbac806b2e765bb28b9fec82e6 Mon Sep 17 00:00:00 2001
From: dcnieho
Date: Wed, 26 Apr 2017 08:45:32 +0000
Subject: [PATCH 2/3] CMake: include/GL/glut.h should only be installed when
FREEGLUT_REPLACE_GLUT is ON
(cherry picked from commit a0b77bba49573dab3564ce22a503024098664f04)
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1798 7f0cb862-5218-0410-a997-914c9d46530a
---
freeglut/freeglut/CMakeLists.txt | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/freeglut/freeglut/CMakeLists.txt b/freeglut/freeglut/CMakeLists.txt
index 6ec15b4..190964f 100644
--- a/freeglut/freeglut/CMakeLists.txt
+++ b/freeglut/freeglut/CMakeLists.txt
@@ -70,8 +70,12 @@ SET(FREEGLUT_HEADERS
include/GL/freeglut.h
include/GL/freeglut_ext.h
include/GL/freeglut_std.h
- include/GL/glut.h
)
+IF(FREEGLUT_REPLACE_GLUT)
+ LIST(APPEND FREEGLUT_SRCS
+ include/GL/glut.h
+ )
+ENDIF()
SET(FREEGLUT_SRCS
${FREEGLUT_HEADERS}
src/fg_callbacks.c
From 174bd482907f828f7b9a20622b3680400b70aba3 Mon Sep 17 00:00:00 2001
From: dcnieho
Date: Wed, 26 Apr 2017 08:45:38 +0000
Subject: [PATCH 3/3] updated text on main website page regarding license of
FreeGLUT
git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1799 7f0cb862-5218-0410-a997-914c9d46530a
---
freeglut/web-src/index.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/freeglut/web-src/index.php b/freeglut/web-src/index.php
index f45727a..fa6abc9 100644
--- a/freeglut/web-src/index.php
+++ b/freeglut/web-src/index.php
@@ -27,7 +27,7 @@ widely available and highly portable.
required for creating windows, initializing OpenGL contexts, and handling input
events, to allow for trully portable OpenGL programs.
-FreeGLUT is released under the X-Consortium license.
+FreeGLUT is released under a license equivalent to the X-Consortium license.