Module: Mesa Branch: master Commit: 4358cfc4adb10d9f4902b4f8cd283610fc101d06 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4358cfc4adb10d9f4902b4f8cd283610fc101d06
Author: Emil Velikov <[email protected]> Date: Thu Apr 14 09:47:50 2016 +0100 doxygen: remove git rebase fallouts Should never have been (git) added in the first place. Signed-off-by: Emil Velikov <[email protected]> --- doxygen/Makefile.orig | 35 ----------------------------------- doxygen/header.html.orig | 19 ------------------- 2 files changed, 54 deletions(-) diff --git a/doxygen/Makefile.orig b/doxygen/Makefile.orig deleted file mode 100644 index b1bc15d..0000000 --- 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 034231c..0000000 --- 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> _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
