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

Proposed by Chase Douglas
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) Approve
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.
Revision history for this message
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
=== modified file 'doc/Doxyfile'
--- doc/Doxyfile 2011-12-13 06:37:37 +0000
+++ doc/Doxyfile 2011-12-14 17:37:34 +0000
@@ -613,7 +613,7 @@
613# with spaces.613# with spaces.
614614
615INPUT = ../include \615INPUT = ../include \
616 .616 ../examples
617617
618# This tag can be used to specify the character encoding of the source files 618# This tag can be used to specify the character encoding of the source files
619# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 619# that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is
@@ -709,7 +709,7 @@
709# and *.h) to filter out the source-files in the directories. If left 709# and *.h) to filter out the source-files in the directories. If left
710# blank all files are included.710# blank all files are included.
711711
712EXAMPLE_PATTERNS = *712EXAMPLE_PATTERNS =
713713
714# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be 714# If the EXAMPLE_RECURSIVE tag is set to YES then subdirectories will be
715# searched for input files to be used with the \include or \dontinclude 715# searched for input files to be used with the \include or \dontinclude
716716
=== modified file 'examples/xorg-gtest.cpp'
--- examples/xorg-gtest.cpp 2011-12-14 15:19:03 +0000
+++ examples/xorg-gtest.cpp 2011-12-14 17:37:34 +0000
@@ -1,24 +1,3 @@
1/*****************************************************************************
2 *
3 * X testing environment - Google Test environment feat. dummy x server
4 *
5 * Copyright (C) 2011 Canonical Ltd.
6 *
7 * This program is free software: you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation, either version 3 of the License, or (at your
10 * option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful, but
13 * WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
15 * General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License along
18 * with this program. If not, see <http://www.gnu.org/licenses/>.
19 *
20 ****************************************************************************/
21
22#include <xorg/gtest/test.h>1#include <xorg/gtest/test.h>
232
24using namespace xorg::testing;3using namespace xorg::testing;

Subscribers

People subscribed via source and target branches