Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
authorDominik Rose <mya@server.fake>
Thu, 27 Jun 2013 17:43:05 +0000 (19:43 +0200)
committerDominik Rose <mya@server.fake>
Thu, 27 Jun 2013 17:43:05 +0000 (19:43 +0200)
commitd39aeeca0f26f7250393c7b025885e1dc408fe7f
tree312438c426b019b8765d7bb2c8624874ed5fb366
parente32700cf8f92b04fa2b0112281c1f369428b6584
parentd76468c22394728da9c2b9f586db8a777388292d
Merge remote-tracking branch 'remotes/upstream/2.4' into dc1394_2-1394b
modules/highgui/src/cap_dc1394_v2.cpp