Wireshark-commits: [Wireshark-commits] [wireshark] 01/01: Merge "MIME: Rename image dissectors to f

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Wed, 29 Jan 2014 22:20:50 +0000 (UTC)
https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=1c09d044cb9e730b14701687070bfce459b5ade1

Changed: branch: master
Repository: wireshark

commit 1c09d044cb9e730b14701687070bfce459b5ade1
Merge: 8f15d3a 2c28c5d
Author: Martin Kaiser <wireshark@xxxxxxxxx>
Date:   Wed Jan 29 22:20:47 2014 +0000

    Merge "MIME: Rename image dissectors to file dissectors."

 epan/CMakeLists.txt                                |    6 +++---
 epan/dissectors/Makefile.common                    |    9 ++++-----
 epan/dissectors/{packet-image-gif.c => file-gif.c} |    2 +-
 .../{packet-image-jfif.c => file-jpeg.c}           |    2 +-
 epan/dissectors/{packet-image-png.c => file-png.c} |    2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)