Wireshark-commits: [Wireshark-commits] [wireshark] 01/01: Merge "Fix bug 9633: Do not try to add a

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 29 Jan 2014 11:18:47 +0000 (UTC)
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=3bba4ea70b8698d675ae7eb802e3741de1426490

Changed: branch: master-1.8
Repository: wireshark

commit 3bba4ea70b8698d675ae7eb802e3741de1426490
Merge: 2fb9848 6df7bb0
Author: Pascal Quantin <pascal.quantin@xxxxxxxxx>
Date:   Wed Jan 29 11:18:46 2014 +0000

    Merge "Fix bug 9633: Do not try to add a new NAL unit when the previous one was not decoded" into master-1.8

 epan/dissectors/packet-h264.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)