CMakeLists.txt | 12 11 + 1 - 0 !
cmake/modules/FindNGHTTP2.cmake | 55 55 + 0 - 0 !
cmakeconfig.h.in | 3 3 + 0 - 0 !
epan/CMakeLists.txt | 9 2 + 7 - 0 !
epan/dissectors/packet-http2.c | 4 3 + 1 - 0 !
epan/epan.c | 11 11 + 0 - 0 !
6 files changed, 85 insertions(+), 9 deletions(-)

 [patch] use system's nghttp2

ipmap.html | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 use system's openlayers.js to avoid privacy breach

epan/prefs.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

---

tools/asn2wrs.py | 4 2 + 2 - 0 !
1 file changed, 2 insertions(+), 2 deletions(-)

 use lex/yacc from ply

ui/gtk/main.c | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 note about readme.debian when running wireshark as root.

Makefile.am | 2 1 + 1 - 0 !
1 file changed, 1 insertion(+), 1 deletion(-)

 don't regenerate svnversion.h

tools/idl2wrs | 33 0 + 33 - 0 !
1 file changed, 33 deletions(-)

 do not try to locate wireshark_be.py and wireshark_gen.py in
 non-standard places.

ui/gtk/about_dlg.c | 2 1 + 1 - 0 !
ui/qt/about_dialog.cpp | 2 1 + 1 - 0 !
2 files changed, 2 insertions(+), 2 deletions(-)

 change location of license file in about dialog