summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDimitri van Heesch <dimitri@stack.nl>2015-07-14 19:05:20 (GMT)
committerDimitri van Heesch <dimitri@stack.nl>2015-07-14 19:05:20 (GMT)
commitc33e03f3cb9f0ae1c00b7e785964c915f4085fe0 (patch)
tree9bd06582503caf6eed2ba774ceb2988188444b43
parent647b6ac8669cd8ba1e8c60eeb3c2de961c7d6a1b (diff)
parent23e84ea6a3d89e1dec704ddbb7e7a2241f984a64 (diff)
downloadDoxygen-c33e03f3cb9f0ae1c00b7e785964c915f4085fe0.zip
Doxygen-c33e03f3cb9f0ae1c00b7e785964c915f4085fe0.tar.gz
Doxygen-c33e03f3cb9f0ae1c00b7e785964c915f4085fe0.tar.bz2
Merge branch 'master' of github.com:doxygen/doxygen
-rwxr-xr-x[-rw-r--r--]addon/doxywizard/images/add.pngbin4321 -> 1680 bytes
-rwxr-xr-x[-rw-r--r--]addon/doxywizard/images/del.pngbin4231 -> 1592 bytes
-rwxr-xr-x[-rw-r--r--]addon/doxywizard/images/file.pngbin4380 -> 1740 bytes
-rwxr-xr-x[-rw-r--r--]addon/doxywizard/images/folder.pngbin4308 -> 1668 bytes
-rwxr-xr-x[-rw-r--r--]addon/doxywizard/images/refresh.pngbin4458 -> 1823 bytes
-rwxr-xr-x[-rw-r--r--]addon/doxywizard/images/tunecolor.pngbin116333 -> 102299 bytes
-rw-r--r--doc/commands.doc12
7 files changed, 6 insertions, 6 deletions
diff --git a/addon/doxywizard/images/add.png b/addon/doxywizard/images/add.png
index 30a7090..3af7eb7 100644..100755
--- a/addon/doxywizard/images/add.png
+++ b/addon/doxywizard/images/add.png
Binary files differ
diff --git a/addon/doxywizard/images/del.png b/addon/doxywizard/images/del.png
index ceb6a60..c2e3bc8 100644..100755
--- a/addon/doxywizard/images/del.png
+++ b/addon/doxywizard/images/del.png
Binary files differ
diff --git a/addon/doxywizard/images/file.png b/addon/doxywizard/images/file.png
index e204f67..14f2c95 100644..100755
--- a/addon/doxywizard/images/file.png
+++ b/addon/doxywizard/images/file.png
Binary files differ
diff --git a/addon/doxywizard/images/folder.png b/addon/doxywizard/images/folder.png
index 2e420e0..c91c582 100644..100755
--- a/addon/doxywizard/images/folder.png
+++ b/addon/doxywizard/images/folder.png
Binary files differ
diff --git a/addon/doxywizard/images/refresh.png b/addon/doxywizard/images/refresh.png
index fd6d565..413735b 100644..100755
--- a/addon/doxywizard/images/refresh.png
+++ b/addon/doxywizard/images/refresh.png
Binary files differ
diff --git a/addon/doxywizard/images/tunecolor.png b/addon/doxywizard/images/tunecolor.png
index bf7be83..4c7dd9d 100644..100755
--- a/addon/doxywizard/images/tunecolor.png
+++ b/addon/doxywizard/images/tunecolor.png
Binary files differ
diff --git a/doc/commands.doc b/doc/commands.doc
index f2150d1..035889f 100644
--- a/doc/commands.doc
+++ b/doc/commands.doc
@@ -2506,7 +2506,7 @@ only copy the detailed documentation, not the brief description.
The second argument is also optional and can be used to specify the
width or height of the image.
- For a descriptionm of the possibilities see the paragraph
+ For a description of the possibilities see the paragraph
\ref image_sizeindicator "Size indication" with the
\ref cmdimage "\\image" command.
@@ -2551,7 +2551,7 @@ class C {};
The second argument is also optional and can be used to specify the
width or height of the image.
- For a descriptionm of the possibilities see the paragraph
+ For a description of the possibilities see the paragraph
\ref image_sizeindicator "Size indication" with the
\ref cmdimage "\\image" command.
@@ -2626,7 +2626,7 @@ class Receiver
The third argument is also optional and can be used to specify the
width or height of the image.
- For a descriptionm of the possibilities see the paragraph
+ For a description of the possibilities see the paragraph
\ref image_sizeindicator "Size indication" with the
\ref cmdimage "\\image" command.
@@ -2681,7 +2681,7 @@ class Receiver
The third argument is also optional and can be used to specify the
width or height of the image.
- For a descriptionm of the possibilities see the paragraph
+ For a description of the possibilities see the paragraph
\ref image_sizeindicator "Size indication" with the
\ref cmdimage "\\image" command.
@@ -2708,7 +2708,7 @@ class Receiver
The third argument is also optional and can be used to specify the
width or height of the image.
- For a descriptionm of the possibilities see the paragraph
+ For a description of the possibilities see the paragraph
\ref image_sizeindicator "Size indication" with the
\ref cmdimage "\\image" command.
@@ -2734,7 +2734,7 @@ class Receiver
The third argument is also optional and can be used to specify the
width or height of the image.
- For a descriptionm of the possibilities see the paragraph
+ For a description of the possibilities see the paragraph
\ref image_sizeindicator "Size indication" with the
\ref cmdimage "\\image" command.