Wireshark-commits: [Wireshark-commits] master 8bf7078: Move ui/qt/main.cpp to wireshark-qt.cpp, and

From: Wireshark code review <code-review-do-not-reply@xxxxxxxxxxxxx>
Date: Thu, 1 Jan 2015 10:46:03 +0000 (UTC)
URL: https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commit;h=8bf7078f7929d45c004372998aa3a87c05d43671
Submitter: Guy Harris (guy@xxxxxxxxxxxx)
Changed: branch: master
Repository: wireshark

Commits:

8bf7078 by Guy Harris (guy@xxxxxxxxxxxx):

    Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.
    
    Change-Id: Ib4684264363593372b3bf078cf17cae1a1cb10d6
    Reviewed-on: https://code.wireshark.org/review/6199
    Reviewed-by: Guy Harris <guy@xxxxxxxxxxxx>
    

Actions performed:

    from  a4019a3   Rename a variable to avoid a compiler warning.
    adds  8bf7078   Move ui/qt/main.cpp to wireshark-qt.cpp, and get rid of the dummy.cpp hack.


Summary of changes:
 CMakeLists.txt                     |    3 +++
 Makefile.am                        |   24 +-----------------------
 ui/qt/CMakeLists.txt               |    1 -
 ui/qt/Makefile.am                  |    1 -
 ui/qt/Makefile.common              |    1 -
 ui/qt/Wireshark.pro                |    4 ++--
 ui/qt/main.cpp => wireshark-qt.cpp |   13 +++++++------
 7 files changed, 13 insertions(+), 34 deletions(-)
 rename ui/qt/main.cpp => wireshark-qt.cpp (99%)