diff options
| author | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
|---|---|---|
| committer | Ben Skeggs <darktama@beleth.(none)> | 2008-02-22 12:25:15 +1100 |
| commit | f7922db610d05efee0ee8c5f0dadb69e3939482e (patch) | |
| tree | accfc0fdd96e1f572213cf69ea365c01bda0ef46 /doxygen | |
| parent | 759fa5fcc8038af4845a6d9c57b75933ef26559c (diff) | |
| parent | 446bfc32a83008e0865ec869bc80b920c907f10f (diff) | |
Merge branch 'upstream-gallium-0.1' into nouveau-gallium-0.1
Conflicts:
src/gallium/drivers/Makefile
Diffstat (limited to 'doxygen')
| -rw-r--r-- | doxygen/gallium.doxy | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/doxygen/gallium.doxy b/doxygen/gallium.doxy index fbcec03ea6..3ef8c6c297 100644 --- a/doxygen/gallium.doxy +++ b/doxygen/gallium.doxy @@ -113,7 +113,7 @@ FULL_PATH_NAMES = YES # If left blank the directory from which doxygen is run is used as the # path to strip. -STRIP_FROM_PATH = ../src/mesa +STRIP_FROM_PATH = ../src # The STRIP_FROM_INC_PATH tag can be used to strip a user-defined part of # the path mentioned in the documentation of a class, which tells @@ -478,9 +478,9 @@ WARN_LOGFILE = # with spaces. INPUT = gallium.doc \ - ../src/mesa/pipe \ + ../src/gallium \ ../src/mesa/state_tracker \ - ../src/mesa/drivers/dri/intel_winsys + ../src/mesa/x86/rtasm # This tag can be used to specify the character encoding of the source files that # doxygen parses. Internally doxygen uses the UTF-8 encoding, which is also the default |