generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #760 from alekcac:2.4

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-04 18:44:34 +04:00
committed by OpenCV Buildbot
parent 6570215205 35f75147b0
commit 80fed87d53
8 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/_themes/blue/layout.html vendored
View File

@@ -183,7 +183,7 @@
{% if theme_lang == 'c' %}
{% endif %}
{% if theme_lang == 'cpp' %}
<li>Try the <a href="http://opencv.willowgarage.com/wiki/Welcome?action=AttachFile&do=get&target=opencv_cheatsheet.pdf">Cheatsheet</a>.</li>
<li>Try the <a href="http://docs.opencv.org/trunk/opencv_cheatsheet.pdf">Cheatsheet</a>.</li>
{% endif %}
{% if theme_lang == 'py' %}
<li>Try the <a href="cookbook.html">Cookbook</a>.</li>

2
doc/tutorials/introduction/linux_eclipse/linux_eclipse.rst
View File

@@ -201,8 +201,6 @@ Assuming that the image to use as the argument would be located in <DisplayImage
V2: Using CMake+OpenCV with Eclipse (plugin CDT)
==================================================
(See the `getting started <http://opencv.willowgarage.com/wiki/Getting_started>` section of the OpenCV Wiki)
Say you have or create a new file, *helloworld.cpp* in a directory called *foo*:
.. code-block:: cpp