Vadim Pisarevsky
|
e625d86485
|
added C= support; modified threading logic in threshold
|
2012-10-10 15:36:32 +04:00 |
|
Daniil Osokin
|
1516a6169a
|
fixed one more msvc warning in tbb kmeans
|
2012-10-10 14:53:29 +04:00 |
|
Daniil Osokin
|
cc2d12b3e6
|
fixed msvc warning in tbb kmeans
|
2012-10-10 14:35:28 +04:00 |
|
daniil.osokin
|
e83ff354bd
|
added TBB for kmeans (patch #1261: thanks to Boris Mansencal)
|
2012-10-10 12:51:12 +04:00 |
|
daniil.osokin
|
a245161de6
|
added perf test for kmeans
|
2012-10-10 12:51:11 +04:00 |
|
Vadim Pisarevsky
|
e365726c4a
|
fixed example of iteration through a SparseMat (bug #2310)
|
2012-10-09 22:16:57 +04:00 |
|
Andrey Kamaev
|
0afd51253d
|
Add else branch to previous fix
|
2012-10-09 20:34:10 +04:00 |
|
Andrey Kamaev
|
34bfda10ca
|
Fix regression in core arithmetic
|
2012-10-09 20:25:36 +04:00 |
|
Vadim Pisarevsky
|
a135e862c1
|
made opencv headers windows.h-less (Bug #2122)
|
2012-10-09 17:12:42 +04:00 |
|
Vadim Pisarevsky
|
df8364ce63
|
Fixed "arr = NaN" case (bug #2056)
|
2012-10-09 16:28:31 +04:00 |
|
Vadim Pisarevsky
|
a8c5e35619
|
some more fixes towards binary compatibility
|
2012-10-09 15:56:16 +04:00 |
|
Vadim Pisarevsky
|
4be7619ce4
|
_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3
|
2012-10-08 21:37:15 +04:00 |
|
Anatoly Baksheev
|
4b5bbb7752
|
fast_nlm initial version
|
2012-10-08 19:57:19 +04:00 |
|
Andrey Kamaev
|
2446c9329f
|
Remove bad perf test for cvRound
|
2012-10-08 18:40:41 +04:00 |
|
Andrey Kamaev
|
8c8ebd9ca6
|
Fix sanity checks for arithmetic tests on CV_32S data
|
2012-10-08 18:06:17 +04:00 |
|
Vadim Pisarevsky
|
94b97b7a63
|
partially recovered binary compatibility (ticket #2415)
|
2012-10-08 17:06:05 +04:00 |
|
Andrey Kamaev
|
25a9b0a255
|
Fix depth calculation for Scalar in core arithmetic
|
2012-10-08 16:15:27 +04:00 |
|
Vladislav Vinogradov
|
ab3a5244ba
|
moved device layer headers to include directory
|
2012-10-05 18:04:23 +04:00 |
|
Roy Reapor
|
aa400c5837
|
Fixed issue 2403
Created temporary files are now deleted in Win32.
|
2012-10-03 22:44:29 -07:00 |
|
Vladislav Vinogradov
|
11367e2c3d
|
added GpuMat support to OutputArray
|
2012-10-02 14:34:17 +04:00 |
|
Anatoly Baksheev
|
55b1d7c097
|
added CUDA_DISABLER preprocessor commands
|
2012-10-01 23:57:38 +04:00 |
|
Vadim Pisarevsky
|
d09b3828b8
|
fixed fail in arithmetic test
|
2012-09-24 16:14:19 +04:00 |
|
Ilya Lavrenov
|
0e07b0d73a
|
uncommented auto enabling GCD on Mac
|
2012-09-24 14:18:15 +04:00 |
|
Ilya Lavrenov
|
077115bd4a
|
debug
|
2012-09-24 12:40:20 +04:00 |
|
Leonid Beynenson
|
46ce5976ae
|
Fix: Windows compilation error in CommandLineParser.
|
2012-09-20 18:11:33 +04:00 |
|
Leonid Beynenson
|
0bde00a88a
|
Changed CommandLineParser to make it less verbose
when it is unrequired.
|
2012-09-20 18:01:24 +04:00 |
|
Alexander Kapustin
|
8f4ddad52d
|
1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
|
2012-09-20 17:24:20 +04:00 |
|
Alexander Kapustin
|
bb3332508e
|
1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
Conflicts:
modules/core/src/arithm.cpp
|
2012-09-20 16:59:48 +04:00 |
|
Andrey Pavlenko
|
3bad6ac0ee
|
This reverts commit 738d3fef38.
|
2012-09-19 18:03:50 +04:00 |
|
Vadim Pisarevsky
|
1ded1597e7
|
fixed mixed-type array operations (bug #2336)
|
2012-09-19 17:55:34 +04:00 |
|
Alexander Kapustin
|
738d3fef38
|
1. New function ActualScalarDepth was added
2. Two new NeonOptimized functions subtract_8u8u32f and subtract_8u8u8s were added
|
2012-09-19 17:08:25 +04:00 |
|
Vadim Pisarevsky
|
37f4ea6be7
|
Merge remote-tracking branch 'origin/master'
|
2012-09-17 16:12:36 +04:00 |
|
Vadim Pisarevsky
|
7946fcdb69
|
added test for #2336
|
2012-09-17 16:12:30 +04:00 |
|
Andrey Kamaev
|
e73089bdb5
|
Fix windows build warnings
|
2012-09-17 13:30:28 +04:00 |
|
Andrey Kamaev
|
f32eb05ea1
|
Fix AVX and other SIMD support detection
|
2012-09-17 13:30:28 +04:00 |
|
Vadim Pisarevsky
|
e94cd1ec72
|
updated description of LineIterator with information about LineIterator::pos() (ticket #2338)
|
2012-09-11 20:20:05 +04:00 |
|
Vadim Pisarevsky
|
7c13dc6cb3
|
little fix in command line parser - catch unknown parameter types
|
2012-09-07 17:49:38 +04:00 |
|
Vadim Pisarevsky
|
0598f33a85
|
refactored command line parser, fixed the docs
|
2012-09-07 17:44:01 +04:00 |
|
AoD314
|
54a202b3d5
|
add new version of CommandLineParser. add empty docs
|
2012-09-07 13:24:48 +04:00 |
|
Vsevolod Glumov
|
037e3ee288
|
Fixed some minor formatting issues in 'old_basic_structures' and 'operations_on_arrays'.
|
2012-09-06 10:57:28 +04:00 |
|
Vsevolod Glumov
|
3d072dce02
|
Revert "Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'."
This reverts commit 907a9101eb.
|
2012-09-06 10:38:03 +04:00 |
|
Vsevolod Glumov
|
907a9101eb
|
Another batch of fixed 'undocumented parameter' warnings in 'operations_on_arrays.rst'.
|
2012-09-05 18:13:54 +04:00 |
|
Andrey Kamaev
|
bcd0aefbca
|
Fix gcc build errors and warnings
|
2012-09-05 15:51:51 +04:00 |
|
Vsevolod Glumov
|
16717a8641
|
Partially cleaned 'operations_on_arrays' section of undocumented parameters.
|
2012-09-04 15:44:21 +04:00 |
|
Vadim Pisarevsky
|
959674618f
|
restored SSE2 and added AVX optimization of the old haar face detector
|
2012-09-04 14:59:38 +04:00 |
|
Vadim Pisarevsky
|
e17b70e533
|
updated documentation with the new PCA functionality
|
2012-09-04 14:14:24 +04:00 |
|
Kevin
|
93155c6ae0
|
Overloaded PCA constructor and ( ) operator to implement Feature#2287 - PCA that retains a specified amount of variance from the data. A sample was added to samples/cpp to demonstrate the new functionality. Docs and Tests were also updated
|
2012-09-04 13:58:59 +04:00 |
|
Vadim Pisarevsky
|
a74a2302aa
|
fixed bug #2331
|
2012-09-04 13:34:52 +04:00 |
|
Vsevolod Glumov
|
ce4ac2d74a
|
Cleaned 'old_basic_structures' of undocumented parameters.
|
2012-08-31 19:32:07 +04:00 |
|
Vincent Rabaud
|
f56432559e
|
add conversion from/to Matx
|
2012-08-28 15:13:41 +04:00 |
|
Vadim Pisarevsky
|
0bd68a70f1
|
fixed #2297, #2300; fixed several warnings
|
2012-08-28 13:45:35 +04:00 |
|
Vsevolod Glumov
|
c78884c780
|
Improved 'Operations on Arrays" section of 'Core' module documentation.
|
2012-08-24 19:08:18 +04:00 |
|
Anatoly Baksheev
|
70204a8e68
|
Removed PtrElemStep, Marked DevMem1D as deprecated, now should use PtrStepSz now
|
2012-08-24 02:02:42 +04:00 |
|
Vincent Rabaud
|
1baf5209c4
|
fix the compile bug
|
2012-08-23 14:20:31 +02:00 |
|
Vsevolod Glumov
|
5648e49d59
|
Merge remote-tracking branch 'origin/master'
|
2012-08-23 14:58:41 +04:00 |
|
Vsevolod Glumov
|
fc307c87dc
|
Improved the public 'non-optimized' duplicates of 'Tegra-optimized' functions.
|
2012-08-23 14:56:02 +04:00 |
|
Anatoly Baksheev
|
d395bf1522
|
minor fix in FindTBB
added texture_binder
|
2012-08-23 13:37:27 +04:00 |
|
Vladislav Vinogradov
|
da5aaab277
|
optimized gpu::integral for Kepler
|
2012-08-22 12:13:34 +04:00 |
|
Vadim Pisarevsky
|
8efb84b5a4
|
added ios camera support in highgui. turned on optimization in opencv2.framework (ticket #2232)
|
2012-08-20 19:36:36 +04:00 |
|
marina.kolpakova
|
66eb96d719
|
minor warning fix
|
2012-08-19 22:43:27 +04:00 |
|
Andrey Kamaev
|
8e2258c494
|
Fix Windows build after commit:41b6d25
|
2012-08-19 00:20:08 +04:00 |
|
Andrey Kamaev
|
ff3aa6cbe1
|
Fix Android build after commit:41b6d25
|
2012-08-17 18:28:50 +04:00 |
|
Vadim Pisarevsky
|
ec8f926686
|
small correction for the previous patch in parallel.cpp
|
2012-08-17 17:34:51 +04:00 |
|
Vadim Pisarevsky
|
41b6d25bdd
|
added cross-platform Mutex implementation; enable platform-native (GDC/Concurrency) parallel_for_ implementation when TBB is not installed.
|
2012-08-17 17:32:06 +04:00 |
|
Andrey Kamaev
|
b0927397e9
|
#2225 Rename getConvertData to getConvertElem to match the headers and documentation
|
2012-08-15 15:34:33 +04:00 |
|
Vladislav Vinogradov
|
7928cec670
|
added linesAccumGlobal kernel
|
2012-08-15 13:18:35 +04:00 |
|
Daniil Osokin
|
45c49a9088
|
Added perf test
|
2012-08-10 17:37:48 +04:00 |
|
Andrey Pavlenko
|
1995b1a06c
|
duplicating cv::error() message to Android logcat
|
2012-08-08 16:39:24 +04:00 |
|
Alexander Mordvintesv
|
a2df490914
|
added CV_IN_OUT to img argument of drawing functions
|
2012-08-08 11:18:52 +03:00 |
|
Vadim Pisarevsky
|
4b5f948307
|
added SSE2-optimized 3x3 invert by Grigoriy Frolov
|
2012-08-07 17:59:52 +04:00 |
|
Andrey Kamaev
|
5100ca7508
|
svn repository web references are replaced with links to git
|
2012-08-07 14:30:36 +04:00 |
|
Vadim Pisarevsky
|
310b1ad7b9
|
moved parallel_for_ and ParallelLoopBody to core.hpp
|
2012-08-03 16:41:00 +04:00 |
|
Vadim Pisarevsky
|
fd9069422a
|
Merge remote-tracking branch 'origin/master'
|
2012-08-03 16:14:38 +04:00 |
|
Ilya Lavrenov
|
27c2aa3a4e
|
parallel version of bilateral filter was implemented using parallel_for_
|
2012-08-02 16:25:30 +04:00 |
|
Vadim Pisarevsky
|
fac3d9994c
|
integrated another portion of SSE optimizations from Grigory Frolov
|
2012-07-31 19:07:55 +04:00 |
|
Vadim Pisarevsky
|
b9d7c712f5
|
made countNonZero SSE code SSE2-compliant and portable
|
2012-07-30 16:02:49 +04:00 |
|
Josh Doe
|
f1690557bf
|
core/stat: fix build with 32-bit
Optimization introduced in b782d8bb only works for 64-bit builds, but
ifdef failed to check for this.
|
2012-07-29 14:48:21 -04:00 |
|
Sam Bromley
|
fd98520d78
|
Protect check of CV_SSE4_2 with #if defined.
|
2012-07-26 12:43:56 -02:30 |
|
Sam Bromley
|
49b55a7245
|
Protect check for _MSC_VER with #if defined.
|
2012-07-26 12:35:21 -02:30 |
|
Maria Dimashova
|
6b7470f683
|
fixed gcc compilation
|
2012-07-24 18:25:46 +04:00 |
|
Vadim Pisarevsky
|
b782d8bb53
|
integrated patch with some SSE2/SSE4.2 optimizations from Grigory Frolov
|
2012-07-24 17:24:31 +04:00 |
|
Marina Kolpakova
|
33d95642d3
|
fixed documentation missmatch for polylines function
|
2012-07-08 18:26:18 +00:00 |
|
Marina Kolpakova
|
66aff45e96
|
fixed #2130
|
2012-07-05 20:55:55 +00:00 |
|
Andrey Kamaev
|
e900952b87
|
quiet most of the OSX build warnings
|
2012-07-05 12:56:31 +00:00 |
|
Vadim Pisarevsky
|
a1bc11c429
|
fixed typo in minMaxIdx description (ticket #2081)
|
2012-07-02 12:59:02 +00:00 |
|
Andrey Kamaev
|
565a8dc30d
|
Fixed automatic temporary files cleaning with run.py on Windows
|
2012-07-02 12:23:57 +00:00 |
|
Vadim Pisarevsky
|
31395b0759
|
added check for false bug report #2081
|
2012-07-01 21:29:50 +00:00 |
|
Vadim Pisarevsky
|
562838e0b5
|
partial fix for repeated algorithm registration (patch #2101 by Stephan Reuter)
|
2012-07-01 21:14:16 +00:00 |
|
Andrey Kamaev
|
afe11f69fb
|
Fixed Windows build warnings and configuration problem.
|
2012-06-30 20:45:01 +00:00 |
|
Andrey Kamaev
|
27c23b557c
|
Merged few small fixes from 2.4 branch
|
2012-06-30 13:36:27 +00:00 |
|
Leonid Beynenson
|
6d3fecd490
|
Fixed small bug in cv::Ptr<_Tp> conversion to cv::Ptr<_Tp2>. Now this conversion is made in a more accurate way.
|
2012-06-29 16:38:03 +00:00 |
|
Andrey Kamaev
|
4d09d62f85
|
Added Ptr<T> support to AlgorithmInfo; fixed some warnings
|
2012-06-29 07:46:53 +00:00 |
|
Vadim Pisarevsky
|
82cb2ab556
|
fixed bug in SVD, ticket #2027; fixed building highgui with ffmpeg support on MacOSX
|
2012-06-28 19:45:13 +00:00 |
|
Vadim Pisarevsky
|
fd901d8323
|
fixed #2108 (thanks to Vincent for the report and proposed solution)
|
2012-06-28 15:52:34 +00:00 |
|
Leonid Beynenson
|
d822989c8b
|
Added template method cv::Algorithm::set(const char* _name, const Ptr<_Tp>& value),
which allows to pass as the second parameter of the method set any cv::Ptr<_Tp> object.
|
2012-06-28 12:17:11 +00:00 |
|
Andrey Kamaev
|
e4965b143f
|
Fixed discrepancy between SSE and regular baranches in FREAK
|
2012-06-28 11:08:11 +00:00 |
|
Vadim Pisarevsky
|
d60b1f2f82
|
fixed bug #2106; added test
|
2012-06-27 20:51:48 +00:00 |
|
Andrey Kamaev
|
f09ae32796
|
Fixed Mat::isContinuous for big matrix (thanks to Boris Mansencal) #2103
|
2012-06-27 14:19:35 +00:00 |
|
Andrey Kamaev
|
0f8e271509
|
Fixing iOS detection in core persistence
|
2012-06-26 09:21:22 +00:00 |
|
Andrey Kamaev
|
dd7eeea118
|
Fixing cv::tempfile on Windows #2093
|
2012-06-26 09:07:37 +00:00 |
|
Andrey Kamaev
|
7b806f6008
|
fixed several documentation errors
|
2012-06-25 12:56:46 +00:00 |
|
Andrey Kamaev
|
d9c74f63e1
|
All tests writing temporary files are updated to use cv::tempfile() function
|
2012-06-25 11:24:06 +00:00 |
|
Marina Kolpakova
|
1365e28a54
|
initial support of GPU LBP classifier: added new style xml format loading
|
2012-06-22 15:00:36 +00:00 |
|
Andrey Kamaev
|
25f70e691a
|
Fixed warnigs from zlib defines
|
2012-06-21 10:28:57 +00:00 |
|
Andrey Kamaev
|
f6ef504ef0
|
Fixed few more warnings/bugs.
|
2012-06-20 21:09:27 +00:00 |
|
Andrey Kamaev
|
7dcbf32532
|
Fixed WString related build problem in Android build
|
2012-06-18 13:08:59 +00:00 |
|
Andrey Kamaev
|
7cccc93bdf
|
Fixed Android build warnings and few warnings in specific cnfigurations
|
2012-06-13 13:19:43 +00:00 |
|
Andrey Kamaev
|
c5aba337e9
|
Fixed number of warnings. Fixed mingw64 build.
|
2012-06-12 14:46:12 +00:00 |
|
Vadim Pisarevsky
|
76f49f3078
|
added script to build the universal opencv2.framework for iOS device and simulator. fixed opencv_world cmake script to create static libopencv_world.a for iOS. temporarily disable compressed file storages in the case of iOS (to avoid dependency of zlib)
|
2012-06-09 16:18:39 +00:00 |
|
Andrey Kamaev
|
f2d3b9b4a1
|
Warning fixes continued
|
2012-06-09 15:00:04 +00:00 |
|
Marina Kolpakova
|
e86f0aaea1
|
fixed hundreds of "anonymous" warnings for gpu module.
|
2012-06-08 17:09:38 +00:00 |
|
Andrey Kamaev
|
47a4e87784
|
Ignored warnings from gtest with precompiled headers enabled
|
2012-06-08 14:54:17 +00:00 |
|
Andrey Kamaev
|
f62028dc16
|
Fixed mingw build.
|
2012-06-08 03:15:08 +00:00 |
|
Andrey Kamaev
|
49a1ba6038
|
Set stricter warning rules for gcc
|
2012-06-07 17:21:29 +00:00 |
|
Alexander Shishkov
|
74786075e3
|
test commit
|
2012-06-06 09:21:09 +00:00 |
|
Alexander Shishkov
|
80a4157f11
|
test commit
|
2012-06-06 09:12:11 +00:00 |
|
Andrey Kamaev
|
834a0b518c
|
Trunk OpenCV version is set to 2.4.9
|
2012-05-31 11:59:43 +00:00 |
|
Andrey Kamaev
|
1a572c8e89
|
Added test for #1997; fixed build warnings
|
2012-05-31 06:59:06 +00:00 |
|
Vadim Pisarevsky
|
17d9509e31
|
changed "void FileStorage::release(string&)" to "string FileStorage::releaseAndGetString()"
|
2012-05-30 13:02:45 +00:00 |
|
Vadim Pisarevsky
|
74882fe188
|
replaced "string FileStorage::release()" with 2 methods to preserve backward compatibility.
|
2012-05-30 11:29:22 +00:00 |
|
Andrey Kamaev
|
a20248977c
|
Documentation: fixed class/struc members documentation; added warning on incorrectly documented member
|
2012-05-29 16:55:46 +00:00 |
|
Andrey Kamaev
|
40e8d08e8d
|
Added check for trailing semicolon to rst parser; fixed few documentation build warnings
|
2012-05-29 10:57:25 +00:00 |
|
Andrey Kamaev
|
05de6302fd
|
Fixed documentation: corrected parameter names
|
2012-05-29 10:36:19 +00:00 |
|
Vladislav Vinogradov
|
67b718f1cb
|
fixed some bugs in gpu module under Windows:
* convertTo alignment error
* compare with scalars error
|
2012-05-29 08:03:36 +00:00 |
|
Andrey Kamaev
|
6ca618277c
|
More fixes for documentation.
|
2012-05-28 20:11:38 +00:00 |
|
Vadim Pisarevsky
|
bc929a7d46
|
added API for storing OpenCV data structures to text string and reading them back
|
2012-05-28 15:38:58 +00:00 |
|
Andrey Kamaev
|
18a8721f49
|
Small fixes for documentation checking script
|
2012-05-28 15:29:21 +00:00 |
|
Andrey Kamaev
|
78329b0dfe
|
New bunch of documentation fixes
|
2012-05-28 14:36:15 +00:00 |
|
Andrey Kamaev
|
71625ad458
|
Fixed more documentation & source discrepancies
|
2012-05-28 11:22:43 +00:00 |
|
Andrey Kamaev
|
eb2f1f81ed
|
Fixed hundreds of documentation problems
|
2012-05-28 07:36:14 +00:00 |
|
Andrey Kamaev
|
9d73b5f510
|
Added test for #914
|
2012-05-25 17:56:28 +00:00 |
|
Alexander Shishkov
|
a71e690b5e
|
temp commit
|
2012-05-25 13:35:14 +00:00 |
|
Alexander Shishkov
|
3165b22a97
|
temp commit
|
2012-05-25 13:16:16 +00:00 |
|
Alexander Shishkov
|
2ac9338f87
|
temp commit
|
2012-05-25 13:11:34 +00:00 |
|
Vadim Pisarevsky
|
513080ea12
|
some more fixes in Algorithm methods declarations
|
2012-05-24 11:50:54 +00:00 |
|
Vadim Pisarevsky
|
5cc4d23d1e
|
fixed description of cv::invert() (ticket #1972)
|
2012-05-23 12:52:46 +00:00 |
|
Vadim Pisarevsky
|
01169ec826
|
fixed description of Algorithm::getList(); added sample, thanks to Shervin Emami (ticket #1972)
|
2012-05-23 12:35:51 +00:00 |
|
Andrey Kamaev
|
3108423a37
|
Fixed assert placement in cv::invert
|
2012-05-23 09:28:26 +00:00 |
|
Vadim Pisarevsky
|
fd68cc768a
|
fixed 2 build problems on MacOSX (highgui with ffmpeg, opencv_world); added macro CV_INIT_ALGORITHM for simpler algorithm registration (ticket #1876)
|
2012-05-21 14:56:07 +00:00 |
|
Maria Dimashova
|
28297c0224
|
fixed Mat::diag (#1939)
|
2012-05-18 14:38:54 +00:00 |
|
Andrey Kamaev
|
0ba3236ce0
|
Fixed Algorithm usage example #1904
|
2012-05-17 10:52:07 +00:00 |
|
Andrey Kamaev
|
5f9e295adf
|
Added test and workaround for #1942
|
2012-05-16 15:11:17 +00:00 |
|
Andrey Kamaev
|
3ec3c59197
|
Updated sanity threshold for convertTo perf test
|
2012-05-12 15:12:21 +00:00 |
|
Andrey Kamaev
|
8408499c94
|
Updated dot profuct function table
|
2012-05-12 11:44:54 +00:00 |
|
Vadim Pisarevsky
|
52797a55e2
|
added support for vector<Mat_<>> in InputArray, OutputArray, split & merge
|
2012-05-11 13:36:48 +00:00 |
|
Vadim Pisarevsky
|
7a7dae3627
|
fixed problem with Mat::copyTo() with Mat_<> arguments (ticket #1918)
|
2012-05-11 12:40:20 +00:00 |
|
Vadim Pisarevsky
|
e794622776
|
propagated 2 fixed from 2.4 to trunk
|
2012-05-11 11:48:26 +00:00 |
|
Anatoly Baksheev
|
a79c52a28f
|
updated printCudaDeviceInfo to support Kepler
|
2012-05-02 21:55:38 +00:00 |
|
Andrey Kamaev
|
3a1f85d4e8
|
Remerged the 2.4.0 branch
|
2012-05-02 20:20:14 +00:00 |
|
Vadim Pisarevsky
|
d5a0088bbe
|
merged 2.4 into trunk
|
2012-04-30 14:33:52 +00:00 |
|