Merge lp:~chasedouglas/xorg-gtest/example-dox into lp:~oif-team/xorg-gtest/trunk

Proposed by Chase Douglas on 2011-12-14
Status: Merged
Merged at revision: 7
Proposed branch: lp:~chasedouglas/xorg-gtest/example-dox
Merge into: lp:~oif-team/xorg-gtest/trunk
Diff against target: 50 lines (+2/-23)
2 files modified
doc/Doxyfile (+2/-2)
examples/xorg-gtest.cpp (+0/-21)
To merge this branch: bzr merge lp:~chasedouglas/xorg-gtest/example-dox
Reviewer Review Type Date Requested Status
Thomas Voß (community) 2011-12-14 Approve on 2011-12-14
Review via email: mp+85711@code.launchpad.net

Commit message

Fix documentation of examples

Description of the change

Fix documentation of examples

To post a comment you must log in.
Thomas Voß (thomas-voss) wrote :

Looks good to me!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'doc/Doxyfile'
2--- doc/Doxyfile 2011-12-13 06:37:37 +0000
3+++ doc/Doxyfile 2011-12-14 17:37:34 +0000
4@@ -613,7 +613,7 @@
5 # with spaces.
6
7 INPUT = ../include \
8- .
9+ ../examples
10
11 # This tag can be used to specify the character encoding of the source files
12 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
13@@ -709,7 +709,7 @@
14 # and *.h) to filter out the source-files in the directories. If left
15 # blank all files are included.
16
17-EXAMPLE_PATTERNS = *
18+EXAMPLE_PATTERNS =
19
20 # If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
21 # searched for input files to be used with the \include or \dontinclude
22
23=== modified file 'examples/xorg-gtest.cpp'
24--- examples/xorg-gtest.cpp 2011-12-14 15:19:03 +0000
25+++ examples/xorg-gtest.cpp 2011-12-14 17:37:34 +0000
26@@ -1,24 +1,3 @@
27-/*****************************************************************************
28- *
29- * X testing environment - Google Test environment feat. dummy x server
30- *
31- * Copyright (C) 2011 Canonical Ltd.
32- *
33- * This program is free software: you can redistribute it and/or modify it
34- * under the terms of the GNU General Public License as published by the
35- * Free Software Foundation, either version 3 of the License, or (at your
36- * option) any later version.
37- *
38- * This program is distributed in the hope that it will be useful, but
39- * WITHOUT ANY WARRANTY; without even the implied warranty of
40- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
41- * General Public License for more details.
42- *
43- * You should have received a copy of the GNU General Public License along
44- * with this program. If not, see <http://www.gnu.org/licenses/>.
45- *
46- ****************************************************************************/
47-
48 #include <xorg/gtest/test.h>
49
50 using namespace xorg::testing;

Subscribers

People subscribed via source and target branches