aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2016-04-14 09:47:50 +0100
committerEmil Velikov <[email protected]>2016-04-14 09:49:09 +0100
commit4358cfc4adb10d9f4902b4f8cd283610fc101d06 (patch)
tree394caf3f08e3968896195e3d4fdaa41f5cbbbf9c
parent8fcacb4f90da7649c729dfe2cf98f24a7360ba50 (diff)
doxygen: remove git rebase fallouts
Should never have been (git) added in the first place. Signed-off-by: Emil Velikov <[email protected]>
-rw-r--r--doxygen/Makefile.orig35
-rw-r--r--doxygen/header.html.orig19
2 files changed, 0 insertions, 54 deletions
diff --git a/doxygen/Makefile.orig b/doxygen/Makefile.orig
deleted file mode 100644
index b1bc15d5a05..00000000000
--- a/doxygen/Makefile.orig
+++ /dev/null
@@ -1,35 +0,0 @@
-
-default: full
-
-all: full subset
-
-%.tag: %.doxy
- doxygen $<
-
-FULL = \
- main.doxy \
- math.doxy \
- vbo.doxy \
- glapi.doxy \
- glsl.doxy \
- swrast.doxy \
- swrast_setup.doxy \
- tnl.doxy \
- tnl_dd.doxy \
- gbm.doxy \
- i965.doxy
-
-full: $(FULL:.doxy=.tag)
- $(foreach FILE,$(FULL),doxygen $(FILE);)
-
-SUBSET = \
- main.doxy \
- math.doxy
-
-subset: $(SUBSET:.doxy=.tag)
- $(foreach FILE,$(SUBSET),doxygen $(FILE);)
-
-clean:
- -rm -rf $(FULL:.doxy=) $(SUBSET:.doxy=)
- -rm -rf *.tag
- -rm -rf *.db
diff --git a/doxygen/header.html.orig b/doxygen/header.html.orig
deleted file mode 100644
index 034231cbdfd..00000000000
--- a/doxygen/header.html.orig
+++ /dev/null
@@ -1,19 +0,0 @@
-<html>
-<head>
-<title>Mesa Source Code Documentation</title>
-<link href="doxygen.css" rel="stylesheet" type="text/css">
-</head>
-<body>
-<div class="qindex">
-<a class="qindex" href="../main/index.html">core</a> |
-<a class="qindex" href="../glapi/index.html">glapi</a> |
-<a class="qindex" href="../glsl/index.html">glsl</a> |
-<a class="qindex" href="../vbo/index.html">vbo</a> |
-<a class="qindex" href="../math/index.html">math</a> |
-<a class="qindex" href="../swrast/index.html">swrast</a> |
-<a class="qindex" href="../swrast_setup/index.html">swrast_setup</a> |
-<a class="qindex" href="../tnl/index.html">tnl</a> |
-<a class="qindex" href="../tnl_dd/index.html">tnl_dd</a> |
-<a class="qindex" href="../gbm/index.html">gbm</a> |
-<a class="qindex" href="../i965/index.html">i965</a>
-</div>