Attachment 272240 Details for Bug 491098 – Rebase of the patch

Rebase of the patch

Patch_application.txt (text/plain), 363.55 KB, created by Zoey Gerrit Prigge

on 2018-01-12 08:07:43 EST

(hide)

Description:

Filename:

MIME Type:

Creator: Zoey Gerrit Prigge

Created: 2018-01-12 08:07:43 EST

Size: 363.55 KB

patch

obsolete

>   34  git rm -r windows
>   35  git rm -r tclpkg
>   36  git rm -r share
>   37  git rm -r rtest
>   42  git rm -r plugin/{xlib,visio,webp,rsvg,quartz,poppler,pango,ming,lasi,gtk,gs,glitz,gdk,gdiplus,gd,devil}
>   44  git rm -r plugin.demo
>   46  git rm -r macos
>   47  git rm -r macosx
>   48  git rm lib/gvc.def
>   49  git rm lib/graph/graph.vcproj
>   50  git add lib/circogen/blockpath.h
>   52  git rm graphviz.sln
>   53  git rm -r dot.demo/
>   54  git rm -r doc
>   56  git rm -r contrib
>   57  git rm -r cmd/{tools,smyrna,mingle,lefty,gvedit,edgepaint,dotty}
>   59  git rm -r cmd/lneato
>   61  git rm -r rtest2
>   62  git rm -r config
>   63  git rm appveyor.yml
>   64  git rm Doxyfile.in
>   66  git add Makefile.am
>   67  git add configure.ac
>   68  git rebase --continue
>   
>
>Changes from abca06ab3d992722b06e3968f90bc3177c264e27 to bd97cff688f7a7b85b6f1262e14eb1cac0862fcd:
> .gitattributes                                               |      3 +
> .gitignore                                                   |    355 +-
> .gitlab-ci.yml                                               |     17 +
> .gitmodules                                                  |      9 +
> .hgignore                                                    |    192 -
> .tito/packages/.readme                                       |      3 +
> .tito/tito.props                                             |      5 +
> .travis.yml                                                  |     78 +-
> CMakeLists.txt                                               |    170 +
> ChangeLog                                                    |     42 +-
> Config.mk.old                                                |     57 -
> Doxyfile.in                                                  |      2 +-
> INSTALL.old                                                  |     70 -
> Makefile.am                                                  |     37 +-
> Makefile.old                                                 |      4 -
> README.md                                                    |     20 +-
> appveyor.yml                                                 |     91 +-
> ast_common.h.in                                              |    222 -
> autogen.sh                                                   |     71 +-
> awk/colortbl.awk                                             |      2 +-
> ci/autotools-build_and_test.sh                               |     38 +
> ci/centos7/Dockerfile                                        |     10 +
> ci/cmake-build_and_test.sh                                   |     60 +
> cmake/FindANN.cmake                                          |     18 +
> cmake/FindAWK.cmake                                          |      5 +
> cmake/FindCairo.cmake                                        |     52 +
> cmake/FindGD.cmake                                           |     18 +
> cmake/FindLTDL.cmake                                         |     18 +
> cmake/FindNSIS.cmake                                         |     10 +
> cmake/FindPangoCairo.cmake                                   |     91 +
> cmake/FindRxSpencer.cmake                                    |     16 +
> cmake/cmake_uninstall.cmake.in                               |     21 +
> cmake/config_checks.cmake                                    |    101 +
> cmake/generate_color_lib.cmake.in                            |     14 +
> cmake/modify_cgraph_grammar.cmake.in                         |     11 +
> cmake/modify_cgraph_scan.cmake.in                            |      4 +
> cmake/modify_common_htmlparse.cmake.in                       |     11 +
> cmake/modify_gml2gv_gmlparse.cmake.in                        |     11 +
> cmake/modify_gml2gv_gmlscan.cmake.in                         |      3 +
> cmake/package_info.cmake                                     |     22 +
> cmd/CMakeLists.txt                                           |      2 +
> cmd/Makefile.old                                             |      8 -
> cmd/dot/CMakeLists.txt                                       |     41 +
> cmd/dot/Makefile.am                                          |     10 +-
> cmd/dot/Makefile.old                                         |     96 -
> cmd/dot/dot.1                                                |     14 +-
> cmd/dot/dot.c                                                |     66 +-
> cmd/dot/dot.vcproj                                           |    203 -
> cmd/dot/dot.vcxproj                                          |    167 +
> cmd/dot/dot.vcxproj.filters                                  |     25 +
> cmd/dot/dot_builtins.c                                       |      2 -
> cmd/dotty/Makefile.am                                        |     14 +-
> cmd/dotty/Makefile.old                                       |     28 -
> cmd/dotty/dotty.vcproj                                       |    198 -
> cmd/dotty/dotty.vcxproj                                      |    100 +
> cmd/dotty/dotty.vcxproj.filters                              |     22 +
> cmd/dotty/mswin32/dotty.mak                                  |    402 +-
> cmd/edgepaint/Makefile.am                                    |      2 +-
> cmd/edgepaint/edgepaint.1                                    |      3 +-
> cmd/edgepaint/edgepaint.vcproj                               |    205 -
> cmd/edgepaint/edgepaint.vcxproj                              |    145 +
> cmd/edgepaint/edgepaint.vcxproj.filters                      |     25 +
> cmd/edgepaint/edgepaintmain.c                                |     20 +-
> cmd/gvedit/Makefile.am                                       |     10 +-
> cmd/gvedit/csettings.cpp                                     |     12 +-
> cmd/gvedit/csettings.h                                       |      2 -
> cmd/gvedit/gvedit.pro.in                                     |      1 -
> cmd/gvedit/gvedit.pro.ms                                     |      1 -
> cmd/gvedit/gvedit.vcproj                                     |    542 -
> cmd/gvedit/gvedit.vcxproj                                    |    254 +
> cmd/gvedit/gvedit.vcxproj.filters                            |    120 +
> cmd/gvedit/main.cpp                                          |     10 +-
> cmd/gvedit/mainwindow.cpp                                    |      4 +-
> cmd/gvedit/ui_settings.h                                     |     68 +-
> cmd/gvmap/Makefile.am                                        |      7 +-
> cmd/gvmap/cluster.c                                          |     10 +-
> cmd/gvmap/gvmap.1                                            |      3 +
> cmd/gvmap/gvmap.c                                            |     45 +-
> cmd/gvmap/gvmap.sln                                          |     40 +-
> cmd/gvmap/gvmap.vcproj                                       |    207 -
> cmd/gvmap/gvmap.vcproj.RESEARCH.arif.user                    |     65 -
> cmd/gvmap/gvmap.vcproj.user                                  |      1 -
> cmd/gvmap/gvmap.vcxproj                                      |    139 +
> cmd/gvmap/gvmap.vcxproj.filters                              |     31 +
> cmd/gvmap/make_map.c                                         |      4 +-
> cmd/gvmap/power.c                                            |      4 +-
> cmd/gvpr/Makefile.am                                         |      2 +-
> cmd/gvpr/Makefile.old                                        |     43 -
> cmd/gvpr/gvpr.vcproj                                         |    202 -
> cmd/gvpr/gvpr.vcxproj                                        |    132 +
> cmd/gvpr/gvpr.vcxproj.filters                                |     22 +
> cmd/gvpr/gvprmain.c                                          |     13 -
> cmd/gvpr/lib/clustg                                          |     54 +
> cmd/lefty/Makefile.am                                        |     20 +-
> cmd/lefty/Makefile.old                                       |    137 -
> cmd/lefty/aix_mods/common.h                                  |      4 +-
> cmd/lefty/common.h                                           |     17 +-
> cmd/lefty/dot2l/dotparse.y                                   |      8 +-
> cmd/lefty/g.c                                                |      6 +-
> cmd/lefty/g.h                                                |      6 +-
> cmd/lefty/gfxview.c                                          |     10 +-
> cmd/lefty/internal.c                                         |     17 -
> cmd/lefty/lefty.c                                            |      2 -
> cmd/lefty/lefty.vcproj                                       |    368 -
> cmd/lefty/lefty.vcxproj                                      |    154 +
> cmd/lefty/lefty.vcxproj.filters                              |    125 +
> cmd/lefty/os/mswin32/lefty.mak                               |   1802 +-
> cmd/lefty/tbl.c                                              |     10 +-
> cmd/lefty/tbl.h                                              |      2 +-
> cmd/lefty/txtview.c                                          |     10 +-
> cmd/lefty/ws/x11/gquery.c                                    |      2 +-
> cmd/lefty/ws/x11/libfilereq/Dir.c                            |     28 +-
> cmd/lefty/ws/x11/libfilereq/Draw.c                           |      7 -
> cmd/lefty/ws/x11/libfilereq/Path.c                           |      9 -
> cmd/lefty/ws/x11/libfilereq/SelFile.c                        |     38 +-
> cmd/lneato/Makefile.am                                       |     14 +-
> cmd/lneato/Makefile.old                                      |     20 -
> cmd/lneato/lneato.vcproj                                     |    198 -
> cmd/lneato/lneato.vcxproj                                    |     96 +
> cmd/lneato/lneato.vcxproj.filters                            |     22 +
> cmd/lneato/mswin32/lneato.mak                                |    402 +-
> cmd/mingle/Makefile.am                                       |      7 +-
> cmd/mingle/mingle.vcproj                                     |    203 -
> cmd/mingle/mingle.vcxproj                                    |    143 +
> cmd/mingle/mingle.vcxproj.filters                            |     25 +
> cmd/mingle/minglemain.c                                      |     32 +-
> cmd/smyrna/Makefile.am                                       |     19 +-
> cmd/smyrna/btree.c                                           |      2 +-
> cmd/smyrna/btree.h                                           |      2 +-
> cmd/smyrna/draw.c                                            |      0
> cmd/smyrna/draw.h                                            |      0
> cmd/smyrna/gltemplate.c                                      |      0
> cmd/smyrna/gltemplate.h                                      |      0
> cmd/smyrna/gui/callbacks.c                                   |      4 +-
> cmd/smyrna/gui/callbacks.h                                   |      2 +-
> cmd/smyrna/gui/datalistcallbacks.c                           |      0
> cmd/smyrna/gui/datalistcallbacks.h                           |      0
> cmd/smyrna/gui/frmobjectui.c                                 |      2 +-
> cmd/smyrna/gui/glcompui.c                                    |      2 +-
> cmd/smyrna/gui/gui.c                                         |      4 +-
> cmd/smyrna/gui/menucallbacks.c                               |      7 +-
> cmd/smyrna/gui/menucallbacks.h                               |      0
> cmd/smyrna/gui/toolboxcallbacks.c                            |      0
> cmd/smyrna/gui/toolboxcallbacks.h                            |      2 +-
> cmd/smyrna/main.c                                            |     12 +-
> cmd/smyrna/materials.h                                       |      0
> cmd/smyrna/polytess.c                                        |      2 +-
> cmd/smyrna/smyrna.vcproj                                     |    463 -
> cmd/smyrna/smyrna.vcproj.RESEARCH.arif.user                  |     65 -
> cmd/smyrna/smyrna.vcxproj                                    |    223 +
> cmd/smyrna/smyrna.vcxproj.filters                            |    195 +
> cmd/smyrna/smyrnadefs.h                                      |      6 +-
> cmd/smyrna/support.c                                         |      4 +-
> cmd/smyrna/support.h                                         |      4 +-
> cmd/smyrna/topfisheyeview.c                                  |     18 +-
> cmd/smyrna/trackball.c                                       |      0
> cmd/smyrna/trackball.h                                       |      0
> cmd/smyrna/tvnodes.c                                         |      0
> cmd/smyrna/tvnodes.h                                         |      0
> cmd/smyrna/viewport.c                                        |      0
> cmd/smyrna/viewport.h                                        |      0
> cmd/tools/CMakeLists.txt                                     |    271 +
> cmd/tools/Makefile.am                                        |     40 +-
> cmd/tools/Makefile.old                                       |    169 -
> cmd/tools/acyclic.c                                          |     31 +-
> cmd/tools/acyclic.vcproj                                     |    199 -
> cmd/tools/acyclic.vcxproj                                    |    108 +
> cmd/tools/acyclic.vcxproj.filters                            |     22 +
> cmd/tools/bcomps.c                                           |     13 -
> cmd/tools/bcomps.vcproj                                      |    201 -
> cmd/tools/bcomps.vcxproj                                     |    108 +
> cmd/tools/bcomps.vcxproj.filters                             |     22 +
> cmd/tools/ccomps.c                                           |      6 -
> cmd/tools/ccomps.vcproj                                      |    201 -
> cmd/tools/ccomps.vcxproj                                     |    114 +
> cmd/tools/ccomps.vcxproj.filters                             |     22 +
> cmd/tools/convert.h                                          |      6 +-
> cmd/tools/cvtgxl.c                                           |      6 +-
> cmd/tools/dijkstra.c                                         |     13 -
> cmd/tools/dijkstra.vcproj                                    |    199 -
> cmd/tools/dijkstra.vcxproj                                   |    102 +
> cmd/tools/dijkstra.vcxproj.filters                           |     22 +
> cmd/tools/gc.c                                               |     11 -
> cmd/tools/gc.vcproj                                          |    203 -
> cmd/tools/gc.vcxproj                                         |    111 +
> cmd/tools/gc.vcxproj.filters                                 |     27 +
> cmd/tools/gml2gv.c                                           |     12 -
> cmd/tools/gml2gv.h                                           |      2 +-
> cmd/tools/gml2gv.vcproj                                      |    219 -
> cmd/tools/gml2gv.vcproj.RESEARCH.arif.user                   |     65 -
> cmd/tools/gml2gv.vcproj.user                                 |      1 -
> cmd/tools/gml2gv.vcxproj                                     |    130 +
> cmd/tools/gml2gv.vcxproj.filters                             |     40 +
> cmd/tools/gmlparse.y                                         |      5 +-
> cmd/tools/gmlscan.l                                          |      2 -
> cmd/tools/graph_generator.c                                  |     91 +-
> cmd/tools/graphml2gv.c                                       |     10 +-
> cmd/tools/graphml2gv.vcproj                                  |    203 -
> cmd/tools/graphml2gv.vcxproj                                 |    110 +
> cmd/tools/graphml2gv.vcxproj.filters                         |     26 +
> cmd/tools/gv2gml.c                                           |     21 +-
> cmd/tools/gv2gml.vcproj                                      |    203 -
> cmd/tools/gv2gml.vcxproj                                     |    104 +
> cmd/tools/gv2gml.vcxproj.filters                             |     26 +
> cmd/tools/gv2gxl.vcproj                                      |    198 -
> cmd/tools/gvcolor.c                                          |     12 -
> cmd/tools/gvcolor.vcproj                                     |    199 -
> cmd/tools/gvcolor.vcxproj                                    |    108 +
> cmd/tools/gvcolor.vcxproj.filters                            |     22 +
> cmd/tools/gvgen.1                                            |     11 +-
> cmd/tools/gvgen.c                                            |     27 +-
> cmd/tools/gvgen.vcproj                                       |    203 -
> cmd/tools/gvgen.vcxproj                                      |    104 +
> cmd/tools/gvgen.vcxproj.filters                              |     25 +
> cmd/tools/gvpack.c                                           |     29 +-
> cmd/tools/gvpack.vcproj                                      |    203 -
> cmd/tools/gvpack.vcxproj                                     |    123 +
> cmd/tools/gvpack.vcxproj.filters                             |     27 +
> cmd/tools/gvpack_builtins.c                                  |      2 +-
> cmd/tools/gxl2gv.c                                           |      9 -
> cmd/tools/gxl2gv.vcproj                                      |    207 -
> cmd/tools/gxl2gv.vcxproj                                     |    116 +
> cmd/tools/gxl2gv.vcxproj.filters                             |     28 +
> cmd/tools/mm2gv.c                                            |     14 -
> cmd/tools/mm2gv.vcproj                                       |    207 -
> cmd/tools/mm2gv.vcxproj                                      |    110 +
> cmd/tools/mm2gv.vcxproj.filters                              |     28 +
> cmd/tools/nop.c                                              |     11 -
> cmd/tools/nop.vcproj                                         |    199 -
> cmd/tools/nop.vcxproj                                        |    108 +
> cmd/tools/nop.vcxproj.filters                                |     22 +
> cmd/tools/sccmap.c                                           |     11 -
> cmd/tools/sccmap.vcproj                                      |    199 -
> cmd/tools/sccmap.vcxproj                                     |    108 +
> cmd/tools/sccmap.vcxproj.filters                             |     22 +
> cmd/tools/tred.1                                             |     11 +
> cmd/tools/tred.c                                             |    254 +-
> cmd/tools/tred.vcproj                                        |    199 -
> cmd/tools/tred.vcxproj                                       |    108 +
> cmd/tools/tred.vcxproj.filters                               |     22 +
> cmd/tools/tred2.c                                            |    107 +
> cmd/tools/unflatten.c                                        |     11 -
> cmd/tools/unflatten.vcproj                                   |    209 -
> cmd/tools/unflatten.vcxproj                                  |    110 +
> cmd/tools/unflatten.vcxproj.filters                          |     26 +
> compat.h                                                     |      2 -
> compat_getopt.h                                              |     34 -
> config-cmake.h.in                                            |     64 +
> config.h.old                                                 |    152 -
> config.iffe                                                  |     86 +-
> config/config_python.py                                      |      8 +-
> configure.ac                                                 |    930 +-
> configure.old                                                |     24 -
> contrib/Makefile.am                                          |      2 +-
> contrib/Makefile.old                                         |     20 -
> contrib/diffimg/Makefile.am                                  |     12 +-
> contrib/diffimg/diffimg.c                                    |     30 +-
> contrib/diffimg/diffimg.vcproj                               |    199 -
> contrib/diffimg/diffimg.vcxproj                              |    112 +
> contrib/diffimg/diffimg.vcxproj.filters                      |     22 +
> contrib/dirgraph/Makefile.old                                |     18 -
> contrib/dirgraph/apache.dot                                  |    194 +-
> contrib/dirgraph/bsdarch.dot                                 |   1326 +-
> contrib/dirgraph/bsdkernel.dot                               |    470 +-
> contrib/dirgraph/dirgraph.pl                                 |    148 +-
> contrib/dirgraph/named.dot                                   |     98 +-
> contrib/lefty-grace/Makefile.old                             |     18 -
> contrib/lefty-grace/README                                   |      2 +-
> contrib/prune/Makefile.am                                    |      2 +-
> contrib/prune/Makefile.old                                   |     33 -
> contrib/prune/generic_list.c                                 |      5 +-
> contrib/prune/generic_list.h                                 |      6 +-
> contrib/prune/prune.c                                        |     15 +-
> contrib/prune/prune.vcproj                                   |    207 -
> contrib/prune/prune.vcxproj                                  |    110 +
> contrib/prune/prune.vcxproj.filters                          |     30 +
> dependencies/criterion                                       |      1 +
> doc/Dot.ref                                                  |      2 +-
> doc/FAQ.html                                                 |      6 +-
> doc/build.html                                               |      9 +-
> doc/docbook/src/graphviz_plugins.xml                         |      2 +-
> doc/dotguide/graphdraw.bib                                   |      2 +-
> doc/dottyguide.pdf                                           |    784 +-
> doc/fontfaq.txt                                              |      4 +-
> doc/info/attrs.html                                          |     55 +-
> doc/info/graphviz_json_schema.json                           |    422 +
> doc/info/output.html                                         |     41 +
> doc/info/schema.html                                         |      1 +
> doc/info/shapes.html                                         |     53 +-
> doc/info/w3data.js                                           |    148 +
> doc/infosrc/Makefile                                         |    229 +
> doc/infosrc/Makefile.old                                     |    223 -
> doc/infosrc/attrs                                            |     33 +-
> doc/infosrc/graphviz_json_schema.json                        |    422 +
> doc/infosrc/html.2                                           |     13 +-
> doc/infosrc/html_grammar                                     |      5 +-
> doc/infosrc/jconvert.py                                      |     14 +
> doc/infosrc/mkoutput.sh                                      |     19 +-
> doc/infosrc/output.1                                         |      7 +
> doc/infosrc/outputs                                          |     25 +
> doc/infosrc/shapes.2                                         |      2 +-
> doc/infosrc/shapes.3                                         |      4 +-
> doc/infosrc/types                                            |     15 +-
> doc/infosrc/w3data.js                                        |    148 +
> doc/lefty/section3.tex                                       |      4 +-
> doc/leftyguide.pdf                                           |    786 +-
> doc/libgraph/sccmap.c                                        |      6 -
> doc/smyrna/using.tex                                         |      2 +-
> doc/winbuild.html                                            |     12 +-
> dot.demo/demo.vcproj                                         |    412 +-
> features/common                                              |    386 -
> graphviz.sln                                                 |   1200 +-
> graphviz.spec                                                |      1 +
> graphviz.spec.in                                             |    989 -
> graphviz.vcproj                                              |   1737 -
> graphviz_version.h.cmake                                     |      8 +
> iffe                                                         |     10 +-
> index.html                                                   |      1 +
> lib/CMakeLists.txt                                           |     30 +
> lib/Makefile.am                                              |      4 +-
> lib/Makefile.old                                             |     10 -
> lib/agraph/Makefile.old                                      |     53 -
> lib/agraph/agraph.h                                          |      8 +-
> lib/agutil/Makefile.am                                       |      2 +-
> lib/agutil/Makefile.old                                      |     32 -
> lib/ast/Makefile.am                                          |      4 +-
> lib/ast/Makefile.old                                         |     38 -
> lib/ast/ast.vcproj                                           |    263 -
> lib/ast/ast.vcxproj                                          |    108 +
> lib/ast/ast.vcxproj.filters                                  |     90 +
> lib/ast/error.c                                              |      2 +-
> lib/ast/pathexists.c                                         |      2 +-
> lib/ast/pathfind.c                                           |      2 -
> lib/ast/pathgetlink.c                                        |      4 +-
> lib/ast/pathpath.c                                           |      2 +-
> lib/ast/strerror.c                                           |     32 -
> lib/ast/strton.c                                             |      7 -
> lib/cdt/CMakeLists.txt                                       |     53 +
> lib/cdt/Cdt_ex/data                                          |     22 -
> lib/cdt/Cdt_ex/uniqword.c                                    |    131 -
> lib/cdt/Cdt_p/hsearch.c                                      |     81 -
> lib/cdt/Cdt_p/tsearch.c                                      |    177 -
> lib/cdt/Cdt_t/dttest.h                                       |     81 -
> lib/cdt/Cdt_t/runtest                                        |     44 -
> lib/cdt/Cdt_t/terror.h                                       |    279 -
> lib/cdt/Cdt_t/tevent.c                                       |     67 -
> lib/cdt/Cdt_t/tobag.c                                        |    100 -
> lib/cdt/Cdt_t/tqueue.c                                       |     61 -
> lib/cdt/Cdt_t/trenew.c                                       |    106 -
> lib/cdt/Cdt_t/tsearch.c                                      |    285 -
> lib/cdt/Cdt_t/tshare.c                                       |     83 -
> lib/cdt/Cdt_t/tstack.c                                       |     66 -
> lib/cdt/Cdt_t/tview.c                                        |     85 -
> lib/cdt/Makefile.am                                          |      6 +-
> lib/cdt/Makefile.old                                         |     58 -
> lib/cdt/README                                               |      6 -
> lib/cdt/cdt.3                                                |    129 +-
> lib/cdt/cdt.def                                              |     26 -
> lib/cdt/cdt.h                                                |    201 +-
> lib/cdt/cdt.vcproj                                           |    276 -
> lib/cdt/cdt.vcxproj                                          |    116 +
> lib/cdt/cdt.vcxproj.filters                                  |     75 +
> lib/cdt/dtclose.c                                            |     19 +-
> lib/cdt/dtdisc.c                                             |     27 +-
> lib/cdt/dtextract.c                                          |      5 -
> lib/cdt/dtflatten.c                                          |      5 -
> lib/cdt/dthash.c                                             |     54 +-
> lib/cdt/dthdr.h                                              |     17 +-
> lib/cdt/dtlist.c                                             |     41 +-
> lib/cdt/dtmethod.c                                           |     16 +-
> lib/cdt/dtopen.c                                             |     18 +-
> lib/cdt/dtrenew.c                                            |     14 +-
> lib/cdt/dtrestore.c                                          |      8 +-
> lib/cdt/dtsize.c                                             |     10 -
> lib/cdt/dtstat.c                                             |     22 -
> lib/cdt/dtstrhash.c                                          |      9 +-
> lib/cdt/dttree.c                                             |     39 +-
> lib/cdt/dttreeset.c                                          |     62 -
> lib/cdt/dtview.c                                             |     31 +-
> lib/cdt/dtwalk.c                                             |     11 +-
> lib/cdt/features/common                                      |    393 -
> lib/cgraph/CMakeLists.txt                                    |     98 +
> lib/cgraph/Makefile.am                                       |     14 +-
> lib/cgraph/Makefile.old                                      |     75 -
> lib/cgraph/agxbuf.c                                          |     14 +-
> lib/cgraph/agxbuf.h                                          |     22 +-
> lib/cgraph/attr.c                                            |      8 +-
> lib/cgraph/cghdr.h                                           |     48 +-
> lib/cgraph/cgraph.def                                        |    167 -
> lib/cgraph/cgraph.h                                          |    255 +-
> lib/cgraph/cgraph.vcproj                                     |    307 -
> lib/cgraph/cgraph.vcxproj                                    |    138 +
> lib/cgraph/cgraph.vcxproj.filters                            |     96 +
> lib/cgraph/edge.c                                            |     49 +-
> lib/cgraph/grammar.y                                         |     10 +-
> lib/cgraph/graph.c                                           |      4 +-
> lib/cgraph/io.c                                              |      9 +-
> lib/cgraph/main.c                                            |     30 -
> lib/cgraph/mem.c                                             |     51 -
> lib/cgraph/node.c                                            |      6 +-
> lib/cgraph/obj.c                                             |      0
> lib/cgraph/pend.c                                            |      2 +-
> lib/cgraph/rec.c                                             |     17 +-
> lib/cgraph/refstr.c                                          |      6 +-
> lib/cgraph/scan.l                                            |      2 +
> lib/cgraph/utils.c                                           |      6 +-
> lib/cgraph/vmstub.h                                          |     30 -
> lib/cgraph/write.c                                           |     12 +-
> lib/circogen/CMakeLists.txt                                  |     37 +
> lib/circogen/Makefile.am                                     |      2 +-
> lib/circogen/Makefile.old                                    |     54 -
> lib/circogen/circpos.c                                       |      2 -
> lib/circogen/gvcircogen.vcproj                               |    251 -
> lib/circogen/gvcircogen.vcxproj                              |    107 +
> lib/circogen/gvcircogen.vcxproj.filters                      |     84 +
> lib/common/CMakeLists.txt                                    |    150 +
> lib/common/Makefile.am                                       |     13 +-
> lib/common/Makefile.old                                      |     79 -
> lib/common/arith.h                                           |      7 +-
> lib/common/arrows.c                                          |      2 +-
> lib/common/colxlate.c                                        |     23 +-
> lib/common/const.h                                           |      4 +-
> lib/common/diagen.c                                          |      2 -
> lib/common/emit.c                                            |      8 +-
> lib/common/geom.c                                            |      6 +-
> lib/common/geom.h                                            |      7 +-
> lib/common/geomprocs.h                                       |     12 +-
> lib/common/globals.c                                         |      2 -
> lib/common/globals.h                                         |     13 +-
> lib/common/glyphwidth.ps                                     |      2 +-
> lib/common/htmllex.c                                         |    140 +-
> lib/common/htmltable.c                                       |     44 +-
> lib/common/input.c                                           |      9 +-
> lib/common/intset.c                                          |      6 +-
> lib/common/labels.c                                          |      6 +-
> lib/common/logic.h                                           |     11 -
> lib/common/macros.h                                          |      4 +-
> lib/common/memory.c                                          |      2 -
> lib/common/memory.h                                          |      2 +-
> lib/common/mpgen.c                                           |      2 +-
> lib/common/ns.c                                              |    371 +-
> lib/common/pointset.h                                        |      3 +-
> lib/common/postproc.c                                        |      8 +-
> lib/common/ps_fontmap.txt                                    |      2 +-
> lib/common/psusershape.c                                     |      2 +-
> lib/common/render.h                                          |     19 +-
> lib/common/routespl.c                                        |      5 +-
> lib/common/shapes.c                                          |      7 +-
> lib/common/splines.c                                         |     36 +-
> lib/common/strcasecmp.c                                      |      2 -
> lib/common/strncasecmp.c                                     |      2 -
> lib/common/taper.c                                           |      2 -
> lib/common/textspan.c                                        |      6 +-
> lib/common/timing.c                                          |      2 +-
> lib/common/timing.h                                          |     28 +
> lib/common/types.h                                           |    623 +
> lib/common/types.h.in                                        |    576 -
> lib/common/usershape.h                                       |     12 +
> lib/common/utils.c                                           |    151 +-
> lib/common/utils.h                                           |      6 +-
> lib/dotgen/CMakeLists.txt                                    |     35 +
> lib/dotgen/Makefile.am                                       |      2 +-
> lib/dotgen/Makefile.old                                      |     38 -
> lib/dotgen/dotinit.c                                         |      1 +
> lib/dotgen/dotprocs.h                                        |      7 -
> lib/dotgen/dotsplines.c                                      |      3 +-
> lib/dotgen/gvdotgen.vcproj                                   |    251 -
> lib/dotgen/gvdotgen.vcxproj                                  |    116 +
> lib/dotgen/gvdotgen.vcxproj.filters                          |     78 +
> lib/dotgen/mincross.c                                        |      2 +-
> lib/dotgen/position.c                                        |      3 +-
> lib/dotgen/rank.c                                            |      2 +-
> lib/dotgen2/Makefile.am                                      |      2 +-
> lib/dotgen2/dot2procs.h                                      |      7 -
> lib/dotgen2/main.c                                           |      6 +-
> lib/dotgen2/minc.c                                           |      2 +-
> lib/dotgen2/minc2.c                                          |      4 +-
> lib/dotgen2/radix.c                                          |      2 +-
> lib/dotgen2/radix0.c                                         |      2 +-
> lib/dotgen2/radix1.c                                         |      2 +-
> lib/dotgen2/timing.c                                         |      4 +-
> lib/edgepaint/Makefile.am                                    |      2 +-
> lib/edgepaint/edgepaintlib.vcproj                            |    219 -
> lib/edgepaint/edgepaintlib.vcxproj                           |    131 +
> lib/edgepaint/edgepaintlib.vcxproj.filters                   |     57 +
> lib/edgepaint/furtherest_point.c                             |      2 +-
> lib/edgepaint/lab_gamut.h                                    |     10 +-
> lib/edgepaint/lab_gamut.vcproj                               |    204 -
> lib/edgepaint/lab_gamut.vcxproj                              |    105 +
> lib/edgepaint/lab_gamut.vcxproj.filters                      |     27 +
> lib/edgepaint/node_distinct_coloring.c                       |      2 +-
> lib/expr/Makefile.am                                         |      9 +-
> lib/expr/Makefile.old                                        |     57 -
> lib/expr/exeval.c                                            |      4 +-
> lib/expr/exlib.h                                             |      2 +-
> lib/expr/exopen.c                                            |      2 -
> lib/expr/exparse.y                                           |      2 +-
> lib/expr/expr.h                                              |      9 +-
> lib/expr/expr.vcproj                                         |    243 -
> lib/expr/expr.vcxproj                                        |    119 +
> lib/expr/expr.vcxproj.filters                                |     81 +
> lib/expr/extoken.c                                           |      2 -
> lib/fdpgen/CMakeLists.txt                                    |     32 +
> lib/fdpgen/Makefile.am                                       |      2 +-
> lib/fdpgen/Makefile.old                                      |     39 -
> lib/fdpgen/clusteredges.c                                    |      4 +-
> lib/fdpgen/fdp.h                                             |      2 -
> lib/fdpgen/fdpinit.c                                         |      6 +-
> lib/fdpgen/grid.c                                            |      7 +-
> lib/fdpgen/grid.h                                            |      4 +-
> lib/fdpgen/gvfdpgen.vcproj                                   |    228 -
> lib/fdpgen/gvfdpgen.vcxproj                                  |    101 +
> lib/fdpgen/gvfdpgen.vcxproj.filters                          |     66 +
> lib/fdpgen/layout.c                                          |     31 +-
> lib/fdpgen/tlayout.c                                         |     28 +-
> lib/gd/COPYING                                               |     50 -
> lib/gd/INSTALL                                               |    229 -
> lib/gd/Makefile.am                                           |     39 -
> lib/gd/Makefile.old                                          |     29 -
> lib/gd/README-JPEG.TXT                                       |    385 -
> lib/gd/README.TXT                                            |     59 -
> lib/gd/aclocal.m4                                            |   5601 -
> lib/gd/annotate.c                                            |    211 -
> lib/gd/bdftogd                                               |    205 -
> lib/gd/circletexttest.c                                      |     73 -
> lib/gd/config.hin                                            |    113 -
> lib/gd/config/Makefile.am                                    |      7 -
> lib/gd/config/config.guess                                   |   1412 -
> lib/gd/config/config.rpath                                   |    513 -
> lib/gd/config/config.sub                                     |   1469 -
> lib/gd/config/depcomp                                        |    423 -
> lib/gd/config/gdlib-config.in                                |     96 -
> lib/gd/config/install-sh                                     |    251 -
> lib/gd/config/ltmain.sh                                      |   5062 -
> lib/gd/config/missing                                        |    336 -
> lib/gd/config/mkinstalldirs                                  |     99 -
> lib/gd/configure                                             |  14123 ---
> lib/gd/configure.ac                                          |    473 -
> lib/gd/configure.pl                                          |    398 -
> lib/gd/demoin.png                                            |    Bin 10027 -> 0 bytes
> lib/gd/depcomp                                               |    423 -
> lib/gd/entities.h                                            |    277 -
> lib/gd/entities.html                                         |    682 -
> lib/gd/entities.tcl                                          |     50 -
> lib/gd/err.out                                               |     63 -
> lib/gd/fontconfigtest.c                                      |     44 -
> lib/gd/fontsizetest.c                                        |     98 -
> lib/gd/fontwheeltest.c                                       |    145 -
> lib/gd/gd-2.0.33.patch                                       |    390 -
> lib/gd/gd.c                                                  |   3548 -
> lib/gd/gd.h                                                  |    810 -
> lib/gd/gd.vcproj                                             |    419 -
> lib/gd/gd2copypal.c                                          |     69 -
> lib/gd/gd2time.c                                             |     64 -
> lib/gd/gd2togif.c                                            |     46 -
> lib/gd/gd2topng.c                                            |     72 -
> lib/gd/gd_gd.c                                               |    325 -
> lib/gd/gd_gd2.c                                              |   1071 -
> lib/gd/gd_gif_in.c                                           |    617 -
> lib/gd/gd_gif_out.c                                          |   1196 -
> lib/gd/gd_io.c                                               |    179 -
> lib/gd/gd_io.h                                               |     55 -
> lib/gd/gd_io_dp.c                                            |    453 -
> lib/gd/gd_io_file.c                                          |    144 -
> lib/gd/gd_io_ss.c                                            |    165 -
> lib/gd/gd_jpeg.c                                             |    990 -
> lib/gd/gd_png.c                                              |    836 -
> lib/gd/gd_security.c                                         |     33 -
> lib/gd/gd_ss.c                                               |     50 -
> lib/gd/gd_topal.c                                            |   2077 -
> lib/gd/gd_wbmp.c                                             |    230 -
> lib/gd/gdcache.c                                             |    230 -
> lib/gd/gdcache.h                                             |     93 -
> lib/gd/gdcmpgif.c                                            |     93 -
> lib/gd/gddemo.c                                              |    198 -
> lib/gd/gdfontg.c                                             |   4387 -
> lib/gd/gdfontg.h                                             |     38 -
> lib/gd/gdfontl.c                                             |   4645 -
> lib/gd/gdfontl.h                                             |     39 -
> lib/gd/gdfontmb.c                                            |   3875 -
> lib/gd/gdfontmb.h                                            |     37 -
> lib/gd/gdfonts.c                                             |   3873 -
> lib/gd/gdfonts.h                                             |     37 -
> lib/gd/gdfontt.c                                             |   2596 -
> lib/gd/gdfontt.h                                             |     38 -
> lib/gd/gdft.c                                                |   1725 -
> lib/gd/gdfx.c                                                |    510 -
> lib/gd/gdfx.h                                                |     73 -
> lib/gd/gdhelpers.c                                           |     97 -
> lib/gd/gdhelpers.h                                           |     69 -
> lib/gd/gdkanji.c                                             |    662 -
> lib/gd/gdparttopng.c                                         |     69 -
> lib/gd/gdtables.c                                            |    726 -
> lib/gd/gdtest.c                                              |    430 -
> lib/gd/gdtestft.c                                            |    206 -
> lib/gd/gdtopng.c                                             |     54 -
> lib/gd/gdxpm.c                                               |    148 -
> lib/gd/gifanimtest.c                                         |     37 -
> lib/gd/giftogd2.c                                            |     48 -
> lib/gd/index.html                                            |   5593 -
> lib/gd/install-item                                          |      5 -
> lib/gd/install-sh                                            |    276 -
> lib/gd/jisx0208.h                                            |   1214 -
> lib/gd/makefile.sample                                       |    171 -
> lib/gd/missing                                               |    336 -
> lib/gd/mkinstalldirs                                         |    111 -
> lib/gd/pngtogd.c                                             |     54 -
> lib/gd/pngtogd2.c                                            |     60 -
> lib/gd/readme.jpn                                            |     39 -
> lib/gd/test/Makefile.am                                      |      6 -
> lib/gd/test/gdtest.gd2                                       |    Bin 28661 -> 0 bytes
> lib/gd/test/gdtest.png                                       |    Bin 26658 -> 0 bytes
> lib/gd/test/gdtest_200_300_150_100.png                       |    Bin 1776 -> 0 bytes
> lib/gd/test/gdtest_merge.png                                 |    Bin 30372 -> 0 bytes
> lib/gd/test/gdtest_wbmp_to_png.png                           |    Bin 3658 -> 0 bytes
> lib/gd/testac.c                                              |    132 -
> lib/gd/testtr.c                                              |     53 -
> lib/gd/wbmp.c                                                |    390 -
> lib/gd/wbmp.h                                                |     56 -
> lib/gd/webpng.c                                              |    296 -
> lib/glcomp/Makefile.am                                       |      4 +-
> lib/glcomp/glcomp.vcproj                                     |    251 -
> lib/glcomp/glcomp.vcxproj                                    |    106 +
> lib/glcomp/glcomp.vcxproj.filters                            |     84 +
> lib/glcomp/glcompdefs.h                                      |      6 +-
> lib/glcomp/glcompfont.h                                      |      2 +-
> lib/glcomp/glcomptext.h                                      |      2 +-
> lib/glcomp/glcomptexture.h                                   |      2 +-
> lib/glcomp/glutils.h                                         |      2 +-
> lib/graph/Makefile.am                                        |      2 +-
> lib/graph/Makefile.old                                       |     46 -
> lib/graph/graph.h                                            |      6 +-
> lib/graph/graph.vcproj                                       |      4 +-
> lib/graph/lexer.c                                            |      2 +-
> lib/graph/libgraph.h                                         |      6 +-
> lib/gvc.def                                                  |     28 +-
> lib/gvc.vcproj                                               |    491 -
> lib/gvc.vcproj.RESEARCH.arif.user                            |     65 -
> lib/gvc.vcxproj                                              |    235 +
> lib/gvc.vcxproj.filters                                      |    273 +
> lib/gvc/CMakeLists.txt                                       |    116 +
> lib/gvc/Makefile.am                                          |      7 +-
> lib/gvc/Makefile.old                                         |     58 -
> lib/gvc/gvc.c                                                |     12 -
> lib/gvc/gvc.def                                              |    339 +
> lib/gvc/gvc.h                                                |      9 +-
> lib/gvc/gvc.vcproj                                           |    311 -
> lib/gvc/gvcext.h                                             |      4 +-
> lib/gvc/gvcint.h                                             |      2 +-
> lib/gvc/gvcjob.h                                             |      2 +-
> lib/gvc/gvconfig.c                                           |     20 +-
> lib/gvc/gvcontext.c                                          |      4 +-
> lib/gvc/gvcproc.h                                            |      2 +-
> lib/gvc/gvdevice.c                                           |     61 +-
> lib/gvc/gvevent.c                                            |      8 +-
> lib/gvc/gvio.h                                               |      3 +-
> lib/gvc/gvjobs.c                                             |      2 -
> lib/gvc/gvlayout.c                                           |      2 -
> lib/gvc/gvloadimage.c                                        |      2 -
> lib/gvc/gvplugin.c                                           |     28 +-
> lib/gvc/gvplugin.h                                           |      2 +-
> lib/gvc/gvplugin_loadimage.h                                 |      2 +-
> lib/gvc/gvrender.c                                           |     81 +-
> lib/gvc/gvtextlayout.c                                       |      2 -
> lib/gvc/gvtool_tred.c                                        |     89 +
> lib/gvc/gvusershape.c                                        |     12 +-
> lib/gvc/regex_win32.c                                        |   5751 -
> lib/gvc/regex_win32.h                                        |    548 -
> lib/gvpr/Makefile.am                                         |      2 +-
> lib/gvpr/Makefile.old                                        |     50 -
> lib/gvpr/actions.c                                           |      6 +-
> lib/gvpr/compile.c                                           |     14 +-
> lib/gvpr/gprstate.c                                          |      2 +-
> lib/gvpr/gprstate.h                                          |      2 +-
> lib/gvpr/gvpr.c                                              |     10 +-
> lib/gvpr/gvpr.h                                              |     12 +-
> lib/gvpr/gvprlib.vcproj                                      |    219 -
> lib/gvpr/gvprlib.vcxproj                                     |    121 +
> lib/gvpr/gvprlib.vcxproj.filters                             |     60 +
> lib/gvpr/queue.c                                             |      2 +-
> lib/ingraphs/CMakeLists.txt                                  |     13 +
> lib/ingraphs/Makefile.am                                     |      2 +-
> lib/ingraphs/Makefile.old                                    |     30 -
> lib/ingraphs/ingraphs.c                                      |     73 -
> lib/ingraphs/ingraphs.vcproj                                 |    174 -
> lib/ingraphs/ingraphs.vcxproj                                |     86 +
> lib/ingraphs/ingraphs.vcxproj.filters                        |     27 +
> lib/inkpot/Makefile.old                                      |     50 -
> lib/inkpot/inkpot_value.h                                    |      6 +-
> lib/label/CMakeLists.txt                                     |     22 +
> lib/label/index.c                                            |      2 +-
> lib/label/node.c                                             |      2 +-
> lib/label/rectangle.c                                        |      6 +-
> lib/label/xlabels.c                                          |      6 +-
> lib/mingle/CMakeLists.txt                                    |     31 +
> lib/mingle/Makefile.am                                       |      2 +-
> lib/mingle/edge_bundling.c                                   |     18 +-
> lib/mingle/minglelib.vcproj                                  |    215 -
> lib/mingle/minglelib.vcxproj                                 |    122 +
> lib/mingle/minglelib.vcxproj.filters                         |     54 +
> lib/mingle/nearest_neighbor_graph.c                          |      2 -
> lib/mingle/nearest_neighbor_graph_ann.cpp                    |      2 -
> lib/neatogen/CMakeLists.txt                                  |    103 +
> lib/neatogen/Makefile.am                                     |      2 +-
> lib/neatogen/Makefile.old                                    |     63 -
> lib/neatogen/adjust.c                                        |     12 +-
> lib/neatogen/call_tri.c                                      |      2 -
> lib/neatogen/closest.c                                       |      2 +-
> lib/neatogen/compute_hierarchy.c                             |      2 +-
> lib/neatogen/constraint.c                                    |      2 -
> lib/neatogen/delaunay.c                                      |      4 +-
> lib/neatogen/edges.c                                         |      2 +-
> lib/neatogen/edges.h                                         |      2 +-
> lib/neatogen/gvneatogen.vcproj                               |    459 -
> lib/neatogen/gvneatogen.vcxproj                              |    167 +
> lib/neatogen/gvneatogen.vcxproj.filters                      |    240 +
> lib/neatogen/matinv.c                                        |      4 -
> lib/neatogen/neato.h                                         |      2 -
> lib/neatogen/neatoinit.c                                     |     58 +-
> lib/neatogen/neatoprocs.h                                    |      3 +-
> lib/neatogen/neatosplines.c                                  |      8 +-
> lib/neatogen/overlap.c                                       |      2 -
> lib/neatogen/poly.c                                          |      2 +-
> lib/neatogen/quad_prog_vpsc.c                                |     16 +-
> lib/neatogen/quad_prog_vpsc.h                                |      2 +-
> lib/neatogen/sparsegraph.h                                   |      4 +-
> lib/neatogen/stress.c                                        |      4 +-
> lib/neatogen/stuff.c                                         |     53 +-
> lib/neatogen/voronoi.c                                       |      4 +-
> lib/ortho/CMakeLists.txt                                     |     37 +
> lib/ortho/Makefile.am                                        |      2 +-
> lib/ortho/Makefile.old                                       |     35 -
> lib/ortho/fPQ.c                                              |      2 -
> lib/ortho/gvortho.vcproj                                     |    239 -
> lib/ortho/gvortho.vcxproj                                    |    104 +
> lib/ortho/gvortho.vcxproj.filters                            |     69 +
> lib/ortho/maze.c                                             |      2 -
> lib/ortho/ortho.c                                            |      2 -
> lib/ortho/partition.c                                        |      4 +-
> lib/ortho/rawgraph.c                                         |      2 -
> lib/ortho/rawgraph.h                                         |      2 +-
> lib/ortho/sgraph.c                                           |      2 -
> lib/ortho/trapezoid.c                                        |    217 +-
> lib/osage/CMakeLists.txt                                     |     21 +
> lib/osage/Makefile.am                                        |      2 +-
> lib/osage/Makefile.old                                       |     39 -
> lib/osage/osage.vcproj                                       |    175 -
> lib/osage/osage.vcxproj                                      |     87 +
> lib/osage/osage.vcxproj.filters                              |     27 +
> lib/pack/CMakeLists.txt                                      |     32 +
> lib/pack/Makefile.old                                        |     54 -
> lib/pack/pack.h                                              |      2 +-
> lib/patchwork/CMakeLists.txt                                 |     23 +
> lib/patchwork/Makefile.am                                    |      2 +-
> lib/patchwork/Makefile.old                                   |     39 -
> lib/patchwork/gvpatchwork.vcproj                             |    187 -
> lib/patchwork/gvpatchwork.vcxproj                            |     91 +
> lib/patchwork/gvpatchwork.vcxproj.filters                    |     36 +
> lib/pathplan/CMakeLists.txt                                  |     54 +
> lib/pathplan/Makefile.am                                     |      2 +-
> lib/pathplan/Makefile.old                                    |     29 -
> lib/pathplan/Pathplan.vcproj                                 |    264 -
> lib/pathplan/Pathplan.vcxproj                                |    124 +
> lib/pathplan/Pathplan.vcxproj.filters                        |     74 +
> lib/pathplan/cvt.c                                           |      2 +-
> lib/pathplan/pathutil.h                                      |      2 +-
> lib/pathplan/route.c                                         |      6 +-
> lib/pathplan/shortest.c                                      |      6 +-
> lib/pathplan/solvers.c                                       |      2 -
> lib/pathplan/vis.h                                           |      2 +-
> lib/rbtree/CMakeLists.txt                                    |     15 +
> lib/rbtree/Makefile.am                                       |      2 +-
> lib/rbtree/Makefile.old                                      |     30 -
> lib/rbtree/misc.c                                            |      6 +-
> lib/rbtree/misc.h                                            |      2 +-
> lib/rbtree/rbtree.vcproj                                     |    193 -
> lib/rbtree/rbtree.vcxproj                                    |     92 +
> lib/rbtree/rbtree.vcxproj.filters                            |     42 +
> lib/rbtree/red_black_tree.c                                  |     16 +-
> lib/rbtree/red_black_tree.h                                  |      0
> lib/rbtree/stack.c                                           |      9 +-
> lib/rbtree/stack.h                                           |      9 +-
> lib/rbtree/test_red_black_tree.c                             |      6 +-
> lib/sfdpgen/CMakeLists.txt                                   |     39 +
> lib/sfdpgen/Makefile.am                                      |      2 +-
> lib/sfdpgen/Makefile.old                                     |     37 -
> lib/sfdpgen/Multilevel.c                                     |      2 +-
> lib/sfdpgen/post_process.c                                   |      2 -
> lib/sfdpgen/sfdp.h                                           |      2 -
> lib/sfdpgen/sfdp.vcproj                                      |    203 -
> lib/sfdpgen/sfdp.vcxproj                                     |     94 +
> lib/sfdpgen/sfdp.vcxproj.filters                             |     48 +
> lib/sfdpgen/sfdpinit.c                                       |     13 +-
> lib/sfdpgen/spring_electrical.c                              |    137 +-
> lib/sfdpgen/spring_electrical.h                              |      1 +
> lib/sfio/Makefile.am                                         |      4 +-
> lib/sfio/Makefile.old                                        |    161 -
> lib/sfio/Makefile.orig                                       |    153 -
> lib/sfio/Sfio_dc/Makefile.am                                 |      4 +-
> lib/sfio/Sfio_dc/Makefile.old                                |     28 -
> lib/sfio/Sfio_dc/sfdcdio.c                                   |    216 -
> lib/sfio/Sfio_dc/sfdcdos.c                                   |     49 -
> lib/sfio/Sfio_dc/sfdcfilter.c                                |     62 +-
> lib/sfio/Sfio_dc/sfdclzw.c                                   |     57 +-
> lib/sfio/Sfio_dc/sfdcseekable.c                              |     55 +-
> lib/sfio/Sfio_dc/sfdcslow.c                                  |     15 +-
> lib/sfio/Sfio_dc/sfdcsubstream.c                             |     65 +-
> lib/sfio/Sfio_dc/sfdctee.c                                   |     36 +-
> lib/sfio/Sfio_dc/sfdcunion.c                                 |     57 +-
> lib/sfio/Sfio_dc/sfdisc.h                                    |     19 +-
> lib/sfio/Sfio_f/Makefile.am                                  |      4 -
> lib/sfio/Sfio_f/Makefile.old                                 |     26 -
> lib/sfio/Sfio_f/_sfclrerr.c                                  |      5 -
> lib/sfio/Sfio_f/_sfdlen.c                                    |      5 -
> lib/sfio/Sfio_f/_sfeof.c                                     |      5 -
> lib/sfio/Sfio_f/_sferror.c                                   |      5 -
> lib/sfio/Sfio_f/_sffileno.c                                  |      5 -
> lib/sfio/Sfio_f/_sfgetc.c                                    |      5 -
> lib/sfio/Sfio_f/_sfllen.c                                    |      5 -
> lib/sfio/Sfio_f/_sfputc.c                                    |      6 -
> lib/sfio/Sfio_f/_sfputd.c                                    |      6 -
> lib/sfio/Sfio_f/_sfputl.c                                    |      6 -
> lib/sfio/Sfio_f/_sfputm.c                                    |      7 -
> lib/sfio/Sfio_f/_sfputu.c                                    |      6 -
> lib/sfio/Sfio_f/_sfslen.c                                    |      4 -
> lib/sfio/Sfio_f/_sfstacked.c                                 |      5 -
> lib/sfio/Sfio_f/_sfulen.c                                    |      5 -
> lib/sfio/Sfio_f/_sfvalue.c                                   |      5 -
> lib/sfio/features/common                                     |    384 -
> lib/sfio/features/sfio                                       |    375 +-
> lib/sfio/features/stdio                                      |    384 -
> lib/sfio/sfclose.c                                           |     20 +-
> lib/sfio/sfclrlock.c                                         |      5 -
> lib/sfio/sfcvt.c                                             |     94 +-
> lib/sfio/sfdisc.c                                            |     16 +-
> lib/sfio/sfdlen.c                                            |      5 -
> lib/sfio/sfexcept.c                                          |     14 +-
> lib/sfio/sfexit.c                                            |    104 +-
> lib/sfio/sfextern.c                                          |     31 +-
> lib/sfio/sffcvt.c                                            |     14 +-
> lib/sfio/sffilbuf.c                                          |     10 +-
> lib/sfio/sfflsbuf.c                                          |     10 +-
> lib/sfio/sfgetd.c                                            |      5 -
> lib/sfio/sfgetl.c                                            |      5 -
> lib/sfio/sfgetm.c                                            |      6 -
> lib/sfio/sfgetr.c                                            |     18 +-
> lib/sfio/sfgetu.c                                            |      5 -
> lib/sfio/sfhdr.h                                             |    467 +-
> lib/sfio/sfio.h                                              |    258 +-
> lib/sfio/sfio.vcproj                                         |    487 -
> lib/sfio/sfio.vcxproj                                        |    165 +
> lib/sfio/sfio.vcxproj.filters                                |    261 +
> lib/sfio/sfio_t.h                                            |      8 +-
> lib/sfio/sfllen.c                                            |      5 -
> lib/sfio/sfmode.c                                            |    111 +-
> lib/sfio/sfmove.c                                            |     24 +-
> lib/sfio/sfmutex.c                                           |     36 -
> lib/sfio/sfnew.c                                             |     26 +-
> lib/sfio/sfnotify.c                                          |      5 -
> lib/sfio/sfnputc.c                                           |     14 +-
> lib/sfio/sfopen.c                                            |     23 +-
> lib/sfio/sfpkrd.c                                            |     38 +-
> lib/sfio/sfpoll.c                                            |     22 +-
> lib/sfio/sfpool.c                                            |     53 +-
> lib/sfio/sfpopen.c                                           |     68 +-
> lib/sfio/sfprintf.c                                          |     38 -
> lib/sfio/sfprints.c                                          |     12 -
> lib/sfio/sfpurge.c                                           |     22 +-
> lib/sfio/sfputd.c                                            |     17 +-
> lib/sfio/sfputl.c                                            |     12 +-
> lib/sfio/sfputm.c                                            |     14 +-
> lib/sfio/sfputr.c                                            |     20 +-
> lib/sfio/sfputu.c                                            |     14 +-
> lib/sfio/sfraise.c                                           |     15 +-
> lib/sfio/sfrd.c                                              |    118 +-
> lib/sfio/sfread.c                                            |     15 +-
> lib/sfio/sfreserve.c                                         |     36 +-
> lib/sfio/sfresize.c                                          |     10 +-
> lib/sfio/sfscanf.c                                           |     38 +-
> lib/sfio/sfseek.c                                            |     39 +-
> lib/sfio/sfset.c                                             |      7 -
> lib/sfio/sfsetbuf.c                                          |    112 +-
> lib/sfio/sfsetfd.c                                           |     18 -
> lib/sfio/sfsize.c                                            |     15 +-
> lib/sfio/sfsk.c                                              |     14 -
> lib/sfio/sfstack.c                                           |     10 +-
> lib/sfio/sfstrtod.c                                          |     19 +-
> lib/sfio/sfswap.c                                            |     12 +-
> lib/sfio/sfsync.c                                            |     16 +-
> lib/sfio/sftable.c                                           |     32 +-
> lib/sfio/sftell.c                                            |      5 -
> lib/sfio/sftmp.c                                             |     77 +-
> lib/sfio/sfungetc.c                                          |     20 +-
> lib/sfio/sfvprintf.c                                         |    108 +-
> lib/sfio/sfvscanf.c                                          |     85 +-
> lib/sfio/sfwr.c                                              |     19 +-
> lib/sfio/sfwrite.c                                           |     14 +-
> lib/sfio/vthread.h                                           |    129 +-
> lib/sparse/CMakeLists.txt                                    |     37 +
> lib/sparse/DotIO.c                                           |      3 +-
> lib/sparse/Makefile.am                                       |      5 +-
> lib/sparse/Makefile.old                                      |     38 -
> lib/sparse/QuadTree.c                                        |     11 +-
> lib/sparse/SparseMatrix.c                                    |     11 +-
> lib/sparse/color_palette.c                                   |  14370 +--
> lib/sparse/general.c                                         |      4 +-
> lib/sparse/general.h                                         |      2 +-
> lib/sparse/gvsparse.vcproj                                   |    223 -
> lib/sparse/gvsparse.vcxproj                                  |    100 +
> lib/sparse/gvsparse.vcxproj.filters                          |     63 +
> lib/spine/CMakeLists.txt                                     |     20 +
> lib/spine/Makefile.am                                        |     20 +
> lib/spine/quad.c                                             |    125 +
> lib/spine/quad.h                                             |     10 +
> lib/spine/spine.c                                            |    677 +
> lib/spine/spine.h                                            |      8 +
> lib/spine/spine.vcxproj                                      |    135 +
> lib/spine/spine.vcxproj.filters                              |     48 +
> lib/spine/spinehdr.h                                         |     40 +
> lib/spine/subset.c                                           |    139 +
> lib/spine/subset.h                                           |     23 +
> lib/spine/union_find.c                                       |     65 +
> lib/spine/union_find.h                                       |     12 +
> lib/topfish/CMakeLists.txt                                   |     18 +
> lib/topfish/Makefile.am                                      |      2 +-
> lib/topfish/hierarchy.c                                      |      2 +-
> lib/topfish/rescale_layout.c                                 |      4 +-
> lib/topfish/topfish.vcproj                                   |    179 -
> lib/topfish/topfish.vcxproj                                  |     88 +
> lib/topfish/topfish.vcxproj.filters                          |     30 +
> lib/twopigen/CMakeLists.txt                                  |     20 +
> lib/twopigen/Makefile.am                                     |      2 +-
> lib/twopigen/Makefile.old                                    |     38 -
> lib/twopigen/circle.c                                        |      4 +-
> lib/twopigen/circle.h                                        |      8 +-
> lib/twopigen/gvtwopigen.vcproj                               |    179 -
> lib/twopigen/gvtwopigen.vcxproj                              |     89 +
> lib/twopigen/gvtwopigen.vcxproj.filters                      |     30 +
> lib/vmalloc/CMakeLists.txt                                   |     28 +
> lib/vmalloc/Makefile.am                                      |     12 +-
> lib/vmalloc/Makefile.old                                     |     55 -
> lib/vmalloc/features/common                                  |    384 -
> lib/vmalloc/features/vmalloc                                 |    103 -
> lib/vmalloc/malloc.c                                         |    176 +-
> lib/vmalloc/vmalloc.h                                        |    164 +-
> lib/vmalloc/vmalloc.vcproj                                   |    273 -
> lib/vmalloc/vmalloc.vcxproj                                  |    121 +
> lib/vmalloc/vmalloc.vcxproj.filters                          |     81 +
> lib/vmalloc/vmbest.c                                         |    187 +-
> lib/vmalloc/vmclear.c                                        |      5 -
> lib/vmalloc/vmclose.c                                        |      7 +-
> lib/vmalloc/vmdcheap.c                                       |     22 +-
> lib/vmalloc/vmdebug.c                                        |    170 +-
> lib/vmalloc/vmdisc.c                                         |      8 +-
> lib/vmalloc/vmexit.c                                         |     82 -
> lib/vmalloc/vmhdr.h                                          |    112 +-
> lib/vmalloc/vmlast.c                                         |     94 +-
> lib/vmalloc/vmopen.c                                         |     18 +-
> lib/vmalloc/vmpool.c                                         |     76 +-
> lib/vmalloc/vmprivate.c                                      |     50 +-
> lib/vmalloc/vmprofile.c                                      |    122 +-
> lib/vmalloc/vmregion.c                                       |      7 +-
> lib/vmalloc/vmsegment.c                                      |     16 +-
> lib/vmalloc/vmset.c                                          |     12 +-
> lib/vmalloc/vmstat.c                                         |      6 -
> lib/vmalloc/vmtrace.c                                        |     48 +-
> lib/vmalloc/vmwalk.c                                         |      8 +-
> lib/vpsc/CMakeLists.txt                                      |     32 +
> lib/vpsc/Makefile.am                                         |      2 +-
> lib/vpsc/Makefile.old                                        |     43 -
> lib/vpsc/csolve_VPSC.cpp                                     |      8 +-
> lib/vpsc/solve_VPSC.cpp                                      |      2 +-
> lib/vpsc/vpsc.vcproj                                         |    243 -
> lib/vpsc/vpsc.vcxproj                                        |    104 +
> lib/vpsc/vpsc.vcxproj.filters                                |     78 +
> lib/xdot/CMakeLists.txt                                      |     37 +
> lib/xdot/Makefile.am                                         |      2 +-
> lib/xdot/Makefile.old                                        |     34 -
> lib/xdot/xdot.c                                              |      0
> lib/xdot/xdot.h                                              |     34 +-
> lib/xdot/xdot.vcproj                                         |    175 -
> lib/xdot/xdot.vcxproj                                        |    102 +
> lib/xdot/xdot.vcxproj.filters                                |     27 +
> macosx/GVWindowController.h                                  |      2 +
> macosx/GVWindowController.m                                  |      9 +
> plugin.demo/xgtk/src/callbacks.c                             |      4 +-
> plugin.demo/xgtk/src/gvdevice_xgtk.c                         |      7 -
> plugin.demo/xgtk/src/interface.c                             |      4 +-
> plugin.demo/xgtk/src/support.c                               |      4 +-
> plugin.demo/xgtk/src/support.h                               |      4 +-
> plugin/CMakeLists.txt                                        |      6 +
> plugin/Makefile.old                                          |      8 -
> plugin/core/CMakeLists.txt                                   |     64 +
> plugin/core/Makefile.am                                      |      4 +-
> plugin/core/Makefile.old                                     |     33 -
> plugin/core/gvloadimage_core.c                               |      8 +-
> plugin/core/gvplugin_core.c                                  |     26 +-
> plugin/core/gvplugin_core.def                                |      5 -
> plugin/core/gvplugin_core.vcproj                             |    250 -
> plugin/core/gvplugin_core.vcxproj                            |    162 +
> plugin/core/gvplugin_core.vcxproj.filters                    |     63 +
> plugin/core/gvrender_core_dia.c                              |      2 -
> plugin/core/gvrender_core_dot.c                              |     15 +-
> plugin/core/gvrender_core_fig.c                              |     16 +-
> plugin/core/gvrender_core_hpgl.c                             |      4 +-
> plugin/core/gvrender_core_json.c                             |    150 +-
> plugin/core/gvrender_core_map.c                              |      2 -
> plugin/core/gvrender_core_mif.c                              |      2 -
> plugin/core/gvrender_core_mp.c                               |     25 +-
> plugin/core/gvrender_core_pic.c                              |      2 -
> plugin/core/gvrender_core_pov.c                              |      4 +-
> plugin/core/gvrender_core_ps.c                               |      2 -
> plugin/core/gvrender_core_svg.c                              |    169 +-
> plugin/core/gvrender_core_tk.c                               |      2 -
> plugin/core/gvrender_core_vml.c                              |      5 +-
> plugin/core/gvrender_core_vtx.c                              |      4 +-
> plugin/core/plugincore.vcproj                                |    253 -
> plugin/devil/Makefile.old                                    |     31 -
> plugin/devil/gvdevice_devil.c                                |      2 -
> plugin/dot_layout/CMakeLists.txt                             |     36 +
> plugin/dot_layout/Makefile.am                                |      5 +-
> plugin/dot_layout/Makefile.old                               |     31 -
> plugin/dot_layout/gvlayout_dot_layout.c                      |     11 -
> plugin/dot_layout/gvplugin_dot_layout.c                      |     22 +-
> plugin/dot_layout/gvplugin_dot_layout.def                    |      4 -
> plugin/dot_layout/gvplugin_dot_layout.vcproj                 |    209 -
> plugin/dot_layout/gvplugin_dot_layout.vcxproj                |    113 +
> plugin/dot_layout/gvplugin_dot_layout.vcxproj.filters        |     25 +
> plugin/gd/CMakeLists.txt                                     |     53 +
> plugin/gd/Makefile.am                                        |      7 +-
> plugin/gd/Makefile.old                                       |     32 -
> plugin/gd/gvdevice_gd.c                                      |     22 -
> plugin/gd/gvloadimage_gd.c                                   |     10 -
> plugin/gd/gvplugin_gd.c                                      |     16 +-
> plugin/gd/gvplugin_gd.def                                    |      3 -
> plugin/gd/gvplugin_gd.vcproj                                 |    225 -
> plugin/gd/gvplugin_gd.vcxproj                                |    124 +
> plugin/gd/gvplugin_gd.vcxproj.filters                        |     37 +
> plugin/gd/gvrender_gd.c                                      |     28 +-
> plugin/gd/gvrender_gd_vrml.c                                 |      9 -
> plugin/gd/gvtextlayout_gd.c                                  |      9 +-
> plugin/gdiplus/CMakeLists.txt                                |     45 +
> plugin/gdiplus/GdiPlusEnums.h.patch                          |     24 +-
> plugin/gdiplus/GdiPlusHeaders.h.patch                        |     16 +-
> plugin/gdiplus/GdiPlusImaging.h.patch                        |     16 +-
> plugin/gdiplus/GdiPlusimageAttributes.h.patch                |     20 +-
> plugin/gdiplus/Makefile.am                                   |      8 +-
> plugin/gdiplus/gvdevice_gdiplus.cpp                          |      2 -
> plugin/gdiplus/gvloadimage_gdiplus.cpp                       |      2 -
> plugin/gdiplus/gvplugin_gdiplus.cpp                          |     21 +-
> plugin/gdiplus/gvplugin_gdiplus.def                          |      3 -
> plugin/gdiplus/gvplugin_gdiplus.vcproj                       |    239 -
> plugin/gdiplus/gvplugin_gdiplus.vcxproj                      |    120 +
> plugin/gdiplus/gvplugin_gdiplus.vcxproj.filters              |     45 +
> plugin/gdiplus/gvrender_gdiplus.cpp                          |      2 -
> plugin/gdiplus/gvtextlayout_gdiplus.cpp                      |      2 -
> plugin/gdk/Makefile.old                                      |     31 -
> plugin/gdk/gvdevice_gdk.c                                    |      2 -
> plugin/gdk/gvloadimage_gdk.c                                 |      4 +-
> plugin/glitz/gvdevice_glitz.c                                |     17 +-
> plugin/gs/Makefile.old                                       |     31 -
> plugin/gs/gvloadimage_gs.c                                   |      9 +-
> plugin/gtk/callbacks.c                                       |      4 +-
> plugin/gtk/gvdevice_gtk.c                                    |      7 -
> plugin/gtk/interface.c                                       |      4 +-
> plugin/gtk/support.c                                         |      4 +-
> plugin/gtk/support.h                                         |      4 +-
> plugin/lasi/Makefile.old                                     |     31 -
> plugin/lasi/gvloadimage_lasi.c                               |      2 -
> plugin/lasi/gvrender_lasi.cpp                                |      2 -
> plugin/ming/Makefile.old                                     |     31 -
> plugin/ming/gvrender_ming.c                                  |      2 -
> plugin/neato_layout/CMakeLists.txt                           |     51 +
> plugin/neato_layout/Makefile.am                              |      4 +-
> plugin/neato_layout/Makefile.old                             |     31 -
> plugin/neato_layout/gvlayout_neato_layout.c                  |     21 -
> plugin/neato_layout/gvplugin_neato_layout.c                  |     16 +-
> plugin/neato_layout/gvplugin_neato_layout.def                |     52 -
> plugin/neato_layout/gvplugin_neato_layout.vcproj             |    209 -
> plugin/neato_layout/gvplugin_neato_layout.vcxproj            |    125 +
> plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters    |     25 +
> plugin/pango/CMakeLists.txt                                  |     58 +
> plugin/pango/Makefile.am                                     |      2 +-
> plugin/pango/Makefile.old                                    |     31 -
> plugin/pango/gvgetfontlist.h                                 |      5 +-
> plugin/pango/gvgetfontlist_pango.c                           |     68 +-
> plugin/pango/gvloadimage_pango.c                             |     21 +-
> plugin/pango/gvplugin_pango.c                                |     15 +-
> plugin/pango/gvplugin_pango.vcproj                           |    219 -
> plugin/pango/gvplugin_pango.vcxproj                          |    137 +
> plugin/pango/gvplugin_pango.vcxproj.filters                  |     39 +
> plugin/pango/gvrender_pango.c                                |     24 +-
> plugin/pango/gvtextlayout_pango.c                            |     14 +-
> plugin/poppler/gvloadimage_poppler.c                         |      4 +-
> plugin/quartz/GVTextLayout.m                                 |      2 -
> plugin/quartz/gvdevice_quartz.c                              |      2 -
> plugin/quartz/gvloadimage_quartz.c                           |      2 -
> plugin/quartz/gvplugin_quartz.c                              |      2 -
> plugin/quartz/gvrender_quartz.c                              |      2 -
> plugin/quartz/gvtextlayout_quartz.c                          |      2 -
> plugin/rsvg/Makefile.am                                      |      5 +-
> plugin/rsvg/Makefile.old                                     |     31 -
> plugin/rsvg/gvloadimage_rsvg.c                               |      4 +-
> plugin/visio/VisioGraphic.cpp                                |      3 +-
> plugin/visio/VisioRender.cpp                                 |      2 -
> plugin/visio/VisioText.cpp                                   |      3 +-
> plugin/visio/gvplugin_visio.c                                |      7 +-
> plugin/visio/gvplugin_visio.sln                              |     40 +-
> plugin/visio/gvplugin_visio.vcproj                           |    213 -
> plugin/visio/gvplugin_visio.vcproj.RESEARCH.arif.user        |    130 +-
> plugin/visio/gvrender_visio_vdx.cpp                          |      2 -
> plugin/webp/gvdevice_webp.c                                  |      2 -
> plugin/webp/gvloadimage_webp.c                               |      6 +-
> plugin/xlib/gvdevice_xlib.c                                  |     21 +-
> plugin/xlib/slow_graph_stream_test.sh                        |     13 +
> plugin/xlib/vimdot.sh                                        |      3 +-
> redhat/graphviz.spec.fedora.in                               |   1030 +
> redhat/graphviz.spec.rhel.in                                 |      1 +
> rtest/FreeBSD.i386/dummy                                     |      0
> rtest/IRIX64.IP35.sgi_cc/dummy                               |      0
> rtest/Linux.ia64.icc8.0/ER.ps                                |    543 -
> rtest/Linux.ia64.icc8.0/Heawood.gv                           |     40 -
> rtest/Linux.ia64.icc8.0/Heawood.ps                           |    536 -
> rtest/Linux.ia64.icc8.0/NaN.gv                               |    217 -
> rtest/Linux.ia64.icc8.0/alf.gv                               |     44 -
> rtest/Linux.ia64.icc8.0/b106.gv                              |    571 -
> rtest/Linux.ia64.icc8.0/b117.ps                              |    459 -
> rtest/Linux.ia64.icc8.0/b117a.ps                             |    459 -
> rtest/Linux.ia64.icc8.0/b124.gv                              |    364 -
> rtest/Linux.ia64.icc8.0/b145.png                             |    Bin 2010 -> 0 bytes
> rtest/Linux.ia64.icc8.0/b15.png                              |      0
> rtest/Linux.ia64.icc8.0/b29.gv                               |    926 -
> rtest/Linux.ia64.icc8.0/b33.ps                               |    279 -
> rtest/Linux.ia64.icc8.0/b34.gif                              |    Bin 4134 -> 0 bytes
> rtest/Linux.ia64.icc8.0/b36.gv                               |    109 -
> rtest/Linux.ia64.icc8.0/b51.gv                               |    313 -
> rtest/Linux.ia64.icc8.0/b56.gif                              |    Bin 7322 -> 0 bytes
> rtest/Linux.ia64.icc8.0/b57.ps                               |   2288 -
> rtest/Linux.ia64.icc8.0/b60.gif                              |    Bin 2115 -> 0 bytes
> rtest/Linux.ia64.icc8.0/b68.ps                               |    683 -
> rtest/Linux.ia64.icc8.0/b69.ps                               |   4870 -
> rtest/Linux.ia64.icc8.0/b71.ps                               |   2516 -
> rtest/Linux.ia64.icc8.0/b81.svg                              |   4148 -
> rtest/Linux.ia64.icc8.0/big.ps                               |   1368 -
> rtest/Linux.ia64.icc8.0/biglabel.ps                          |    747 -
> rtest/Linux.ia64.icc8.0/clust4.gv                            |     43 -
> rtest/Linux.ia64.icc8.0/crazy.gv                             |     97 -
> rtest/Linux.ia64.icc8.0/crazy.ps                             |   2665 -
> rtest/Linux.ia64.icc8.0/dpd.ps                               |   1223 -
> rtest/Linux.ia64.icc8.0/dpd1.ps                              |   1281 -
> rtest/Linux.ia64.icc8.0/dpd2.ps                              |   1249 -
> rtest/Linux.ia64.icc8.0/dpd3.ps                              |   1403 -
> rtest/Linux.ia64.icc8.0/dpd4.ps                              |   1403 -
> rtest/Linux.ia64.icc8.0/dpd5.ps                              |   1367 -
> rtest/Linux.ia64.icc8.0/jsort.gv                             |    152 -
> rtest/Linux.ia64.icc8.0/lsunix1.ps                           |   1937 -
> rtest/Linux.ia64.icc8.0/lsunix2.ps                           |   1937 -
> rtest/Linux.ia64.icc8.0/lsunix3.ps                           |   1986 -
> rtest/Linux.ia64.icc8.0/newarrows.gif                        |    Bin 19311 -> 0 bytes
> rtest/Linux.ia64.icc8.0/newarrows.ps                         |   1405 -
> rtest/Linux.ia64.icc8.0/p.ps                                 |    436 -
> rtest/Linux.ia64.icc8.0/p2.ps                                |    436 -
> rtest/Linux.ia64.icc8.0/p3.ps                                |    450 -
> rtest/Linux.ia64.icc8.0/p4.ps                                |    539 -
> rtest/Linux.ia64.icc8.0/pgram.gv                             |    158 -
> rtest/Linux.ia64.icc8.0/proc3d.gv                            |    141 -
> rtest/Linux.ia64.icc8.0/process.ps                           |    436 -
> rtest/Linux.ia64.icc8.0/record2.gv                           |      7 -
> rtest/Linux.ia64.icc8.0/structs.gv                           |      9 -
> rtest/Linux.ia64.icc8.0/structs.ps                           |    415 -
> rtest/Linux.ia64.icc8.0/trapeziumlr.gv                       |    126 -
> rtest/Linux.ia64.icc8.0/unix.gv                              |     95 -
> rtest/Linux.ia64.icc8.0/unix.ps                              |   1790 -
> rtest/Linux.ia64.icc8.0/unix2.gv                             |    107 -
> rtest/Linux.ia64.icc8.0/unix2k.gv                            |    107 -
> rtest/graphs/b545.gv                                         |     18 +-
> rtest/graphs/b993.gv                                         |     20 +-
> rtest/graphs/cairo.gv                                        |    188 +-
> rtest/graphs/html2.gv                                        |     11 +-
> rtest/graphs/inv_val.gv                                      |      2 +-
> rtest/graphs/nul_val.gv                                      |      2 +-
> rtest/graphs/val_inv.gv                                      |      2 +-
> rtest/graphs/val_nul.gv                                      |      2 +-
> rtest/graphs/val_val.gv                                      |      4 +-
> rtest/imagepath_test/imagepath_test.sh                       |      1 -
> rtest/linux.x86/AvantGarde_dot.png                           |    Bin 0 -> 100495 bytes
> rtest/linux.x86/AvantGarde_dot.ps                            |    473 +
> rtest/linux.x86/Bookman_dot.png                              |    Bin 0 -> 119222 bytes
> rtest/linux.x86/Bookman_dot.ps                               |    473 +
> rtest/linux.x86/Courier_dot.png                              |    Bin 0 -> 94426 bytes
> rtest/linux.x86/Courier_dot.ps                               |    473 +
> rtest/linux.x86/Helvetica_dot.png                            |    Bin 0 -> 205251 bytes
> rtest/linux.x86/Helvetica_dot.ps                             |    769 +
> rtest/linux.x86/NewCenturySchlbk_dot.png                     |    Bin 0 -> 120823 bytes
> rtest/linux.x86/NewCenturySchlbk_dot.ps                      |    473 +
> rtest/linux.x86/Palatino_dot.png                             |    Bin 0 -> 110533 bytes
> rtest/linux.x86/Palatino_dot.ps                              |    473 +
> rtest/linux.x86/Symbol_dot.png                               |    Bin 0 -> 68833 bytes
> rtest/linux.x86/Times_dot.png                                |    Bin 0 -> 97392 bytes
> rtest/linux.x86/Times_dot.ps                                 |    473 +
> rtest/linux.x86/ZapfChancery_dot.png                         |    Bin 0 -> 27997 bytes
> rtest/linux.x86/ZapfChancery_dot.ps                          |    251 +
> rtest/linux.x86/ZapfDingbats_dot.png                         |    Bin 0 -> 18811 bytes
> rtest/linux.x86/ZapfDingbats_dot.ps                          |    251 +
> rtest/linux.x86/arrows_dot.gv                                |    339 +
> rtest/linux.x86/arrows_dot.ps                                |   1255 +
> rtest/linux.x86/arrowsize_dot.png                            |    Bin 0 -> 135997 bytes
> rtest/linux.x86/cairo_dot_cairo.png                          |    Bin 0 -> 596278 bytes
> rtest/linux.x86/cairo_dot_cairo.ps                           |   1774 +
> rtest/linux.x86/cairo_dot_cairo.svg                          |    869 +
> rtest/linux.x86/center_dot.png                               |    Bin 0 -> 7612 bytes
> rtest/linux.x86/center_dot.ps                                |    264 +
> rtest/linux.x86/clusters_dot.png                             |    Bin 0 -> 39516 bytes
> rtest/linux.x86/clusters_dot.ps                              |    654 +
> rtest/linux.x86/clustlabel_dot.ps                            |    277 +
> rtest/linux.x86/clustlabel_dot1.ps                           |    277 +
> rtest/linux.x86/clustlabel_dot2.ps                           |    277 +
> rtest/linux.x86/clustlabel_dot3.ps                           |    277 +
> rtest/linux.x86/clustlabel_dot4.ps                           |    277 +
> rtest/linux.x86/clustlabel_dot5.ps                           |    277 +
> rtest/linux.x86/clustlabel_dot6.ps                           |    277 +
> rtest/linux.x86/clustlabel_dot7.ps                           |    277 +
> rtest/linux.x86/color_dot.png                                |    Bin 0 -> 10097 bytes
> rtest/linux.x86/color_dot1.png                               |    Bin 0 -> 11279 bytes
> rtest/linux.x86/colors_dot.ps                                |    336 +
> rtest/linux.x86/colorscheme_dot.png                          |    Bin 0 -> 5082 bytes
> rtest/linux.x86/colorscheme_dot.ps                           |    357 +
> rtest/linux.x86/compound_dot.gv                              |     52 +
> rtest/linux.x86/crazy_dot.png                                |    Bin 0 -> 69516 bytes
> rtest/linux.x86/crazy_dot.ps                                 |   2264 +
> rtest/linux.x86/decorate_dot.png                             |    Bin 0 -> 262906 bytes
> rtest/linux.x86/dir_dot.ps                                   |    351 +
> rtest/linux.x86/dotsplines_dot.gv                            |    205 +
> rtest/linux.x86/dotsplines_dot1.gv                           |    208 +
> rtest/linux.x86/edgeclip_dot.gv                              |     24 +
> rtest/linux.x86/fdp_clus_fdp.png                             |    Bin 0 -> 25228 bytes
> rtest/linux.x86/flatedge_dot.gv                              |     35 +
> rtest/linux.x86/grdangles_dot.png                            |    Bin 0 -> 101547 bytes
> rtest/linux.x86/grdangles_dot.svg                            |    245 +
> rtest/linux.x86/grdcluster_dot.png                           |    Bin 0 -> 15000 bytes
> rtest/linux.x86/grdcluster_dot.svg                           |    121 +
> rtest/linux.x86/grdcolors_dot.png                            |    Bin 0 -> 63155 bytes
> rtest/linux.x86/grdcolors_dot.svg                            |    339 +
> rtest/linux.x86/grdfillcolor_dot.png                         |    Bin 0 -> 117434 bytes
> rtest/linux.x86/grdfillcolor_dot.svg                         |    723 +
> rtest/linux.x86/grdlinear_angle_dot.png                      |    Bin 0 -> 246180 bytes
> rtest/linux.x86/grdlinear_angle_dot.svg                      |    725 +
> rtest/linux.x86/grdlinear_dot.png                            |    Bin 0 -> 196882 bytes
> rtest/linux.x86/grdlinear_dot.svg                            |    725 +
> rtest/linux.x86/grdlinear_node_dot.png                       |    Bin 0 -> 20004 bytes
> rtest/linux.x86/grdlinear_node_dot.svg                       |    103 +
> rtest/linux.x86/grdradial_angle_dot.png                      |    Bin 0 -> 308137 bytes
> rtest/linux.x86/grdradial_angle_dot.svg                      |    725 +
> rtest/linux.x86/grdradial_dot.png                            |    Bin 0 -> 301978 bytes
> rtest/linux.x86/grdradial_dot.svg                            |    725 +
> rtest/linux.x86/grdradial_node_dot.png                       |    Bin 0 -> 35149 bytes
> rtest/linux.x86/grdradial_node_dot.svg                       |    103 +
> rtest/linux.x86/grdshapes_dot.png                            |    Bin 0 -> 71658 bytes
> rtest/linux.x86/grdshapes_dot.svg                            |    598 +
> rtest/linux.x86/html2_dot.gv                                 |     61 +
> rtest/linux.x86/html2_dot.ps                                 |    564 +
> rtest/linux.x86/html2_dot.svg                                |    111 +
> rtest/linux.x86/html_dot.gv                                  |     40 +
> rtest/linux.x86/html_dot.ps                                  |    392 +
> rtest/linux.x86/inv_inv_dot.png                              |    Bin 0 -> 23183 bytes
> rtest/linux.x86/inv_nul_dot.png                              |    Bin 0 -> 20435 bytes
> rtest/linux.x86/inv_val_dot.png                              |    Bin 0 -> 23082 bytes
> rtest/linux.x86/japanese_dot.png                             |    Bin 0 -> 41818 bytes
> rtest/linux.x86/layers_dot.ps                                |    449 +
> rtest/linux.x86/mode_neato.ps                                |   7191 ++
> rtest/linux.x86/mode_neato1.ps                               |   7191 ++
> rtest/linux.x86/mode_neato2.ps                               |   7191 ++
> rtest/linux.x86/model_neato.ps                               |   7191 ++
> rtest/linux.x86/model_neato1.ps                              |   7191 ++
> rtest/linux.x86/neatosplines_neato.gv                        |    225 +
> rtest/linux.x86/neatosplines_neato1.gv                       |    232 +
> rtest/linux.x86/nestedclust_dot.gv                           |     47 +
> rtest/linux.x86/nojustify_dot.png                            |    Bin 0 -> 5858 bytes
> rtest/linux.x86/nojustify_dot.ps                             |    369 +
> rtest/linux.x86/nojustify_dot_cairo.ps                       |    423 +
> rtest/linux.x86/nojustify_dot_gd.png                         |    Bin 0 -> 2026 bytes
> rtest/linux.x86/nul_inv_dot.png                              |    Bin 0 -> 24928 bytes
> rtest/linux.x86/nul_nul_dot.png                              |    Bin 0 -> 19645 bytes
> rtest/linux.x86/nul_val_dot.png                              |    Bin 0 -> 27896 bytes
> rtest/linux.x86/ordering_dot.gv                              |     56 +
> rtest/linux.x86/ordering_dot1.gv                             |     55 +
> rtest/linux.x86/overlap_neato.gv                             |    222 +
> rtest/linux.x86/overlap_neato1.gv                            |    222 +
> rtest/linux.x86/pack_neato.gv                                |    104 +
> rtest/linux.x86/pack_neato1.gv                               |    106 +
> rtest/linux.x86/pack_neato2.gv                               |    106 +
> rtest/linux.x86/page_neato.ps                                |   8091 ++
> rtest/linux.x86/page_neato1.ps                               |   8091 ++
> rtest/linux.x86/page_neato2.ps                               |   8091 ++
> rtest/linux.x86/polypoly_dot.png                             |    Bin 0 -> 824696 bytes
> rtest/linux.x86/polypoly_dot.ps                              |   3531 +
> rtest/linux.x86/ports_dot.gv                                 |     81 +
> rtest/linux.x86/ps_user_shapes_dot.ps                        |    486 +
> rtest/linux.x86/pslib_dot.ps                                 |   1858 +
> rtest/linux.x86/rankdir_dot.gv                               |    392 +
> rtest/linux.x86/rankdir_dot1.gv                              |    392 +
> rtest/linux.x86/rankdir_dot2.gv                              |    392 +
> rtest/linux.x86/rd_rules_dot.png                             |    Bin 0 -> 42327 bytes
> rtest/linux.x86/record_dot.gv                                |    112 +
> rtest/linux.x86/record_dot.ps                                |    941 +
> rtest/linux.x86/root_circo.gv                                |  11806 ++
> rtest/linux.x86/root_twopi.gv                                |  11806 ++
> rtest/linux.x86/rootlabel_dot.ps                             |    302 +
> rtest/linux.x86/rootlabel_dot1.ps                            |    302 +
> rtest/linux.x86/rootlabel_dot2.ps                            |    302 +
> rtest/linux.x86/rootlabel_dot3.ps                            |    302 +
> rtest/linux.x86/rootlabel_dot4.ps                            |    302 +
> rtest/linux.x86/rootlabel_dot5.ps                            |    302 +
> rtest/linux.x86/rootlabel_dot6.ps                            |    302 +
> rtest/linux.x86/rootlabel_dot7.ps                            |    302 +
> rtest/linux.x86/rotate_dot.png                               |    Bin 0 -> 79982 bytes
> rtest/linux.x86/rotate_dot.ps                                |   2264 +
> rtest/linux.x86/rotate_dot1.png                              |    Bin 0 -> 79982 bytes
> rtest/linux.x86/rotate_dot1.ps                               |   2264 +
> rtest/linux.x86/rowcolsep_dot.gv                             |     24 +
> rtest/linux.x86/rowcolsep_dot1.gv                            |     24 +
> rtest/linux.x86/russian_dot.png                              |    Bin 0 -> 54481 bytes
> rtest/linux.x86/sb_box_dbl_dot.png                           |    Bin 0 -> 11498 bytes
> rtest/linux.x86/sb_box_dot.png                               |    Bin 0 -> 9590 bytes
> rtest/linux.x86/sb_circle_dbl_dot.png                        |    Bin 0 -> 19571 bytes
> rtest/linux.x86/sb_circle_dot.png                            |    Bin 0 -> 16907 bytes
> rtest/linux.x86/shapes_dot.gv                                |    164 +
> rtest/linux.x86/shapes_dot.ps                                |   1432 +
> rtest/linux.x86/sides_dot.ps                                 |    358 +
> rtest/linux.x86/size_ex_dot.png                              |    Bin 0 -> 4164 bytes
> rtest/linux.x86/size_ex_dot.ps                               |  37921 ++++++
> rtest/linux.x86/size_neato.png                               |    Bin 0 -> 66552 bytes
> rtest/linux.x86/size_neato.ps                                |   7191 ++
> rtest/linux.x86/sl_box_dbl_dot.png                           |    Bin 0 -> 149833 bytes
> rtest/linux.x86/sl_box_dot.png                               |    Bin 0 -> 88100 bytes
> rtest/linux.x86/sl_circle_dbl_dot.png                        |    Bin 0 -> 216367 bytes
> rtest/linux.x86/sl_circle_dot.png                            |    Bin 0 -> 158535 bytes
> rtest/linux.x86/sq_rules_dot.png                             |    Bin 0 -> 35702 bytes
> rtest/linux.x86/sr_box_dbl_dot.png                           |    Bin 0 -> 150770 bytes
> rtest/linux.x86/sr_box_dot.png                               |    Bin 0 -> 88064 bytes
> rtest/linux.x86/sr_circle_dbl_dot.png                        |    Bin 0 -> 251037 bytes
> rtest/linux.x86/sr_circle_dot.png                            |    Bin 0 -> 183937 bytes
> rtest/linux.x86/st_box_dbl_dot.png                           |    Bin 0 -> 154073 bytes
> rtest/linux.x86/st_box_dot.png                               |    Bin 0 -> 114531 bytes
> rtest/linux.x86/st_circle_dbl_dot.png                        |    Bin 0 -> 246612 bytes
> rtest/linux.x86/st_circle_dot.png                            |    Bin 0 -> 201976 bytes
> rtest/linux.x86/style_dot.png                                |    Bin 0 -> 41693 bytes
> rtest/linux.x86/style_dot.ps                                 |    868 +
> rtest/linux.x86/url_dot.cmapx                                |     21 +
> rtest/linux.x86/url_dot.cmapx_np                             |     15 +
> rtest/linux.x86/url_dot.imap                                 |     20 +
> rtest/linux.x86/url_dot.imap_np                              |     14 +
> rtest/linux.x86/url_dot.ps2                                  |    538 +
> rtest/linux.x86/url_dot.svg                                  |    176 +
> rtest/linux.x86/user_shapes_dot.ps                           |    480 +
> rtest/linux.x86/user_shapes_dot_gd.png                       |    Bin 0 -> 21954 bytes
> rtest/linux.x86/val_inv_dot.png                              |    Bin 0 -> 25525 bytes
> rtest/linux.x86/val_nul_dot.png                              |    Bin 0 -> 25376 bytes
> rtest/linux.x86/val_val_dot.png                              |    Bin 0 -> 25362 bytes
> rtest/linux.x86/viewport_neato.png                           |    Bin 0 -> 32548 bytes
> rtest/linux.x86/viewport_neato.ps                            |    942 +
> rtest/linux.x86/viewport_neato1.png                          |    Bin 0 -> 74126 bytes
> rtest/linux.x86/viewport_neato1.ps                           |   2077 +
> rtest/linux.x86/viewport_neato2.png                          |    Bin 0 -> 58413 bytes
> rtest/linux.x86/viewport_neato2.ps                           |    955 +
> rtest/linux.x86/weight_dot.gv                                |    206 +
> rtest/linux.x86/xlabels_dot.png                              |    Bin 0 -> 15801 bytes
> rtest/linux.x86/xlabels_neato.png                            |    Bin 0 -> 19222 bytes
> rtest/nshare/html2_dot.svg                                   |    111 +
> rtest/rtest.sh                                               |     30 +-
> rtest/sgi.mips3/dummy                                        |      0
> rtest/sol6.sun4/b69.ps                                       |   4872 -
> rtest/sol6.sun4/ldbxtried.gv                                 |    121 -
> rtest/tests.txt                                              |      1 +
> rtest/windows/ER.gv                                          |     78 +-
> rtest/windows/ER.ps                                          |   1086 +-
> rtest/windows/Heawood.gv                                     |     80 +-
> rtest/windows/Heawood.ps                                     |   1072 +-
> rtest/windows/KW91.gv                                        |     90 +-
> rtest/windows/Latin1.gv                                      |     10 +-
> rtest/windows/NaN.gv                                         |    434 +-
> rtest/windows/Petersen.gv                                    |     60 +-
> rtest/windows/abstract.gv                                    |    246 +-
> rtest/windows/alf.gv                                         |     88 +-
> rtest/windows/b102.gv                                        |   2328 +-
> rtest/windows/b106.gv                                        |   1136 +-
> rtest/windows/b117.ps                                        |    914 +-
> rtest/windows/b117a.ps                                       |    914 +-
> rtest/windows/b124.gv                                        |    728 +-
> rtest/windows/b135.ps                                        |    616 +-
> rtest/windows/b155.ps                                        |    622 +-
> rtest/windows/b22.ps                                         |    582 +-
> rtest/windows/b29.gv                                         |   1796 +-
> rtest/windows/b3.ps                                          |    550 +-
> rtest/windows/b33.ps                                         |    558 +-
> rtest/windows/b36.gv                                         |    218 +-
> rtest/windows/b491.gv                                        |     20 +-
> rtest/windows/b51.gv                                         |    626 +-
> rtest/windows/b57.ps                                         |   4028 +-
> rtest/windows/b62.plain                                      |     12 +-
> rtest/windows/b68.ps                                         |   1366 +-
> rtest/windows/b69.ps                                         |   9744 +-
> rtest/windows/b7.ps                                          |    814 +-
> rtest/windows/b71.ps                                         |   5030 +-
> rtest/windows/b81.svg                                        |   8296 +-
> rtest/windows/b94.gv                                         |    232 +-
> rtest/windows/big.ps                                         |   2736 +-
> rtest/windows/biglabel.ps                                    |   1494 +-
> rtest/windows/clust.gv                                       |     68 +-
> rtest/windows/clust1.gv                                      |     58 +-
> rtest/windows/clust2.gv                                      |     58 +-
> rtest/windows/clust3.gv                                      |     58 +-
> rtest/windows/clust4.gv                                      |     86 +-
> rtest/windows/clust5.gv                                      |     78 +-
> rtest/windows/crazy.gv                                       |    194 +-
> rtest/windows/crazy.ps                                       |   5330 +-
> rtest/windows/ctext.gv                                       |     36 +-
> rtest/windows/dfa.gv                                         |     84 +-
> rtest/windows/dpd.ps                                         |   2446 +-
> rtest/windows/dpd1.ps                                        |   2514 +-
> rtest/windows/dpd2.ps                                        |   2492 +-
> rtest/windows/dpd3.ps                                        |   2806 +-
> rtest/windows/dpd4.ps                                        |   2806 +-
> rtest/windows/dpd5.ps                                        |   2734 +-
> rtest/windows/fig6.gv                                        |    262 +-
> rtest/windows/fsm.gv                                         |     56 +-
> rtest/windows/grammar.gv                                     |    234 +-
> rtest/windows/hashtable.gv                                   |     40 +-
> rtest/windows/jcctree.gv                                     |     88 +-
> rtest/windows/jsort.gv                                       |    304 +-
> rtest/windows/labelclust-fbc.gv                              |     48 +-
> rtest/windows/labelclust-fbd.gv                              |     46 +-
> rtest/windows/labelclust-fbl.gv                              |     48 +-
> rtest/windows/labelclust-fbr.gv                              |     48 +-
> rtest/windows/labelclust-fdc.gv                              |     46 +-
> rtest/windows/labelclust-fdd.gv                              |     44 +-
> rtest/windows/labelclust-fdl.gv                              |     46 +-
> rtest/windows/labelclust-fdr.gv                              |     46 +-
> rtest/windows/labelclust-ftc.gv                              |     48 +-
> rtest/windows/labelclust-ftd.gv                              |     46 +-
> rtest/windows/labelclust-ftl.gv                              |     48 +-
> rtest/windows/labelclust-ftr.gv                              |     48 +-
> rtest/windows/labelclust-nbc.gv                              |     48 +-
> rtest/windows/labelclust-nbd.gv                              |     46 +-
> rtest/windows/labelclust-nbl.gv                              |     48 +-
> rtest/windows/labelclust-nbr.gv                              |     48 +-
> rtest/windows/labelclust-ndc.gv                              |     46 +-
> rtest/windows/labelclust-ndd.gv                              |     44 +-
> rtest/windows/labelclust-ndl.gv                              |     46 +-
> rtest/windows/labelclust-ndr.gv                              |     46 +-
> rtest/windows/labelclust-ntc.gv                              |     48 +-
> rtest/windows/labelclust-ntd.gv                              |     46 +-
> rtest/windows/labelclust-ntl.gv                              |     48 +-
> rtest/windows/labelclust-ntr.gv                              |     48 +-
> rtest/windows/labelroot-fbc.gv                               |     46 +-
> rtest/windows/labelroot-fbd.gv                               |     46 +-
> rtest/windows/labelroot-fbl.gv                               |     46 +-
> rtest/windows/labelroot-fbr.gv                               |     46 +-
> rtest/windows/labelroot-fdc.gv                               |     48 +-
> rtest/windows/labelroot-fdd.gv                               |     48 +-
> rtest/windows/labelroot-fdl.gv                               |     48 +-
> rtest/windows/labelroot-fdr.gv                               |     48 +-
> rtest/windows/labelroot-ftc.gv                               |     46 +-
> rtest/windows/labelroot-ftd.gv                               |     46 +-
> rtest/windows/labelroot-ftl.gv                               |     46 +-
> rtest/windows/labelroot-ftr.gv                               |     46 +-
> rtest/windows/labelroot-nbc.gv                               |     46 +-
> rtest/windows/labelroot-nbd.gv                               |     46 +-
> rtest/windows/labelroot-nbl.gv                               |     46 +-
> rtest/windows/labelroot-nbr.gv                               |     46 +-
> rtest/windows/labelroot-ndc.gv                               |     48 +-
> rtest/windows/labelroot-ndd.gv                               |     48 +-
> rtest/windows/labelroot-ndl.gv                               |     48 +-
> rtest/windows/labelroot-ndr.gv                               |     48 +-
> rtest/windows/labelroot-ntc.gv                               |     46 +-
> rtest/windows/labelroot-ntd.gv                               |     46 +-
> rtest/windows/labelroot-ntl.gv                               |     46 +-
> rtest/windows/labelroot-ntr.gv                               |     46 +-
> rtest/windows/layer.ps                                       |   1106 +-
> rtest/windows/layer2.ps                                      |   1106 +-
> rtest/windows/ldbxtried.gv                                   |    246 +-
> rtest/windows/longflat.gv                                    |     28 +-
> rtest/windows/lsunix1.ps                                     |   3874 +-
> rtest/windows/lsunix2.ps                                     |   3874 +-
> rtest/windows/lsunix3.ps                                     |   3972 +-
> rtest/windows/mike.gv                                        |    154 +-
> rtest/windows/newarrows.gv                                   |    174 +-
> rtest/windows/newarrows.ps                                   |   2810 +-
> rtest/windows/ngk10_4.gv                                     |    334 +-
> rtest/windows/ngk10_4.ps                                     |   2648 +-
> rtest/windows/nhg.gv                                         |     30 +-
> rtest/windows/p.ps                                           |    872 +-
> rtest/windows/p2.ps                                          |    872 +-
> rtest/windows/p3.ps                                          |    900 +-
> rtest/windows/p4.ps                                          |   1078 +-
> rtest/windows/pgram.gv                                       |    316 +-
> rtest/windows/pm2way.gv                                      |     44 +-
> rtest/windows/pmpipe.gv                                      |     72 +-
> rtest/windows/polypoly.gv                                    |    292 +-
> rtest/windows/proc3d.gv                                      |    282 +-
> rtest/windows/process.gv                                     |     54 +-
> rtest/windows/process.ps                                     |    872 +-
> rtest/windows/record2.gv                                     |     14 +-
> rtest/windows/records.gv                                     |     38 +-
> rtest/windows/rowe.gv                                        |    238 +-
> rtest/windows/shells.gv                                      |    254 +-
> rtest/windows/states.gv                                      |     28 +-
> rtest/windows/structs.gv                                     |     18 +-
> rtest/windows/structs.ps                                     |    830 +-
> rtest/windows/train11.gv                                     |     82 +-
> rtest/windows/trapeziumlr.gv                                 |    252 +-
> rtest/windows/tree.gv                                        |     42 +-
> rtest/windows/triedds.gv                                     |     70 +-
> rtest/windows/try.gv                                         |     58 +-
> rtest/windows/unix.gv                                        |    190 +-
> rtest/windows/unix.ps                                        |   3580 +-
> rtest/windows/unix2.gv                                       |    214 +-
> rtest/windows/unix2k.gv                                      |    214 +-
> rtest/windows/viewfile.gv                                    |    130 +-
> rtest/windows/world.gv                                       |    390 +-
> rtest2/rtests.PLAN                                           |      4 +-
> share/examples/world.gv                                      | 592818 ++++++++++++++++++++++++++++++++++++++++++-------------------------------------------
> share/gui/attr_widgets.dot                                   |     98 +-
> share/gui/mouse_actions.txt                                  |      2 +-
> tclpkg/Makefile.am                                           |     78 +-
> tclpkg/Makefile.old                                          |      4 -
> tclpkg/gdtclft/Makefile.am                                   |      6 +-
> tclpkg/gdtclft/Makefile.old                                  |     27 -
> tclpkg/gdtclft/gdtclft.3tcl                                  |      2 +-
> tclpkg/gdtclft/gdtclft.c                                     |      4 +-
> tclpkg/gv/Makefile.am                                        |    187 +-
> tclpkg/gv/demo/Makefile.am                                   |     16 +-
> tclpkg/gv/demo/modgraph.lua                                  |      9 +-
> tclpkg/gv/gv.cpp                                             |     11 +
> tclpkg/gv/gv.i                                               |      9 +-
> tclpkg/gv/gv_doc_langs.tcl                                   |     92 +
> tclpkg/gv/gv_doc_template.tcl                                |      7 +-
> tclpkg/gv/test.lua                                           |      2 +-
> tclpkg/tcldot/Makefile.am                                    |     19 +-
> tclpkg/tcldot/Makefile.old                                   |     76 -
> tclpkg/tcldot/README                                         |      2 +-
> tclpkg/tcldot/tcldot-id.c                                    |     10 +-
> tclpkg/tcldot/tcldot.3tcl                                    |      2 +-
> tclpkg/tcldot/tcldot.h                                       |      4 +-
> tclpkg/tcldot/tcldot_builtins.c                              |      2 -
> tclpkg/tclhandle/Makefile.old                                |     23 -
> tclpkg/tclhandle/tclhandle.c                                 |     29 +-
> tclpkg/tclhandle/tclhandle.h                                 |     12 +-
> tclpkg/tclpathplan/tclpathplan.c                             |     16 +-
> tclpkg/tclstubs/Makefile.old                                 |     23 -
> tclpkg/tclstubs/README                                       |      2 +-
> tclpkg/tkspline/tkspline.c                                   |      2 -
> tclpkg/tkstubs/README                                        |      2 +-
> tests/CMakeLists.txt                                         |      7 +
> tests/Makefile.am                                            |      4 +
> tests/regression_tests/CMakeLists.txt                        |      1 +
> tests/regression_tests/Makefile.am                           |      1 +
> tests/regression_tests/regression_test_helpers.py            |     38 +
> tests/regression_tests/regression_tests.bat                  |      4 +
> tests/regression_tests/shapes/CMakeLists.txt                 |      5 +
> tests/regression_tests/shapes/Makefile.am                    |      2 +
> tests/regression_tests/shapes/reference/Mcircle.gv           |      9 +
> tests/regression_tests/shapes/reference/Mcircle.svg          |     20 +
> tests/regression_tests/shapes/reference/Mcircle.xdot         |     13 +
> tests/regression_tests/shapes/reference/Mdiamond.gv          |      9 +
> tests/regression_tests/shapes/reference/Mdiamond.svg         |     22 +
> tests/regression_tests/shapes/reference/Mdiamond.xdot        |     14 +
> tests/regression_tests/shapes/reference/Msquare.gv           |      9 +
> tests/regression_tests/shapes/reference/Msquare.svg          |     22 +
> tests/regression_tests/shapes/reference/Msquare.xdot         |     14 +
> tests/regression_tests/shapes/reference/assembly.gv          |      9 +
> tests/regression_tests/shapes/reference/assembly.svg         |     21 +
> tests/regression_tests/shapes/reference/assembly.xdot        |     14 +
> tests/regression_tests/shapes/reference/box.gv               |      9 +
> tests/regression_tests/shapes/reference/box.svg              |     18 +
> tests/regression_tests/shapes/reference/box.xdot             |     13 +
> tests/regression_tests/shapes/reference/box3d.gv             |      9 +
> tests/regression_tests/shapes/reference/box3d.svg            |     21 +
> tests/regression_tests/shapes/reference/box3d.xdot           |     14 +
> tests/regression_tests/shapes/reference/cds.gv               |      9 +
> tests/regression_tests/shapes/reference/cds.svg              |     18 +
> tests/regression_tests/shapes/reference/cds.xdot             |     13 +
> tests/regression_tests/shapes/reference/circle.gv            |      9 +
> tests/regression_tests/shapes/reference/circle.svg           |     18 +
> tests/regression_tests/shapes/reference/circle.xdot          |     13 +
> tests/regression_tests/shapes/reference/component.gv         |      9 +
> tests/regression_tests/shapes/reference/component.svg        |     20 +
> tests/regression_tests/shapes/reference/component.xdot       |     14 +
> tests/regression_tests/shapes/reference/cylinder.gv          |      9 +
> tests/regression_tests/shapes/reference/cylinder.svg         |     19 +
> tests/regression_tests/shapes/reference/cylinder.xdot        |     14 +
> tests/regression_tests/shapes/reference/diamond.gv           |      9 +
> tests/regression_tests/shapes/reference/diamond.svg          |     18 +
> tests/regression_tests/shapes/reference/diamond.xdot         |     13 +
> tests/regression_tests/shapes/reference/doublecircle.gv      |      9 +
> tests/regression_tests/shapes/reference/doublecircle.svg     |     19 +
> tests/regression_tests/shapes/reference/doublecircle.xdot    |     13 +
> tests/regression_tests/shapes/reference/doubleoctagon.gv     |      9 +
> tests/regression_tests/shapes/reference/doubleoctagon.svg    |     19 +
> tests/regression_tests/shapes/reference/doubleoctagon.xdot   |     14 +
> tests/regression_tests/shapes/reference/egg.gv               |      9 +
> tests/regression_tests/shapes/reference/egg.svg              |     18 +
> tests/regression_tests/shapes/reference/egg.xdot             |     23 +
> tests/regression_tests/shapes/reference/ellipse.gv           |      9 +
> tests/regression_tests/shapes/reference/ellipse.svg          |     18 +
> tests/regression_tests/shapes/reference/ellipse.xdot         |     13 +
> tests/regression_tests/shapes/reference/fivepoverhang.gv     |      9 +
> tests/regression_tests/shapes/reference/fivepoverhang.svg    |     20 +
> tests/regression_tests/shapes/reference/fivepoverhang.xdot   |     13 +
> tests/regression_tests/shapes/reference/folder.gv            |      9 +
> tests/regression_tests/shapes/reference/folder.svg           |     18 +
> tests/regression_tests/shapes/reference/folder.xdot          |     13 +
> tests/regression_tests/shapes/reference/hexagon.gv           |      9 +
> tests/regression_tests/shapes/reference/hexagon.svg          |     18 +
> tests/regression_tests/shapes/reference/hexagon.xdot         |     13 +
> tests/regression_tests/shapes/reference/house.gv             |      9 +
> tests/regression_tests/shapes/reference/house.svg            |     18 +
> tests/regression_tests/shapes/reference/house.xdot           |     13 +
> tests/regression_tests/shapes/reference/insulator.gv         |      9 +
> tests/regression_tests/shapes/reference/insulator.svg        |     21 +
> tests/regression_tests/shapes/reference/insulator.xdot       |     14 +
> tests/regression_tests/shapes/reference/invhouse.gv          |      9 +
> tests/regression_tests/shapes/reference/invhouse.svg         |     18 +
> tests/regression_tests/shapes/reference/invhouse.xdot        |     13 +
> tests/regression_tests/shapes/reference/invtrapezium.gv      |      9 +
> tests/regression_tests/shapes/reference/invtrapezium.svg     |     18 +
> tests/regression_tests/shapes/reference/invtrapezium.xdot    |     13 +
> tests/regression_tests/shapes/reference/invtriangle.gv       |      9 +
> tests/regression_tests/shapes/reference/invtriangle.svg      |     18 +
> tests/regression_tests/shapes/reference/invtriangle.xdot     |     13 +
> tests/regression_tests/shapes/reference/larrow.gv            |      9 +
> tests/regression_tests/shapes/reference/larrow.svg           |     18 +
> tests/regression_tests/shapes/reference/larrow.xdot          |     13 +
> tests/regression_tests/shapes/reference/lpromoter.gv         |      9 +
> tests/regression_tests/shapes/reference/lpromoter.svg        |     18 +
> tests/regression_tests/shapes/reference/lpromoter.xdot       |     13 +
> tests/regression_tests/shapes/reference/none.gv              |      9 +
> tests/regression_tests/shapes/reference/none.svg             |     17 +
> tests/regression_tests/shapes/reference/none.xdot            |     12 +
> tests/regression_tests/shapes/reference/note.gv              |      9 +
> tests/regression_tests/shapes/reference/note.svg             |     20 +
> tests/regression_tests/shapes/reference/note.xdot            |     13 +
> tests/regression_tests/shapes/reference/noverhang.gv         |      9 +
> tests/regression_tests/shapes/reference/noverhang.svg        |     23 +
> tests/regression_tests/shapes/reference/noverhang.xdot       |     15 +
> tests/regression_tests/shapes/reference/octagon.gv           |      9 +
> tests/regression_tests/shapes/reference/octagon.svg          |     18 +
> tests/regression_tests/shapes/reference/octagon.xdot         |     13 +
> tests/regression_tests/shapes/reference/oval.gv              |      9 +
> tests/regression_tests/shapes/reference/oval.svg             |     18 +
> tests/regression_tests/shapes/reference/oval.xdot            |     13 +
> tests/regression_tests/shapes/reference/parallelogram.gv     |      9 +
> tests/regression_tests/shapes/reference/parallelogram.svg    |     18 +
> tests/regression_tests/shapes/reference/parallelogram.xdot   |     13 +
> tests/regression_tests/shapes/reference/pentagon.gv          |      9 +
> tests/regression_tests/shapes/reference/pentagon.svg         |     18 +
> tests/regression_tests/shapes/reference/pentagon.xdot        |     13 +
> tests/regression_tests/shapes/reference/plain.gv             |      9 +
> tests/regression_tests/shapes/reference/plain.svg            |     17 +
> tests/regression_tests/shapes/reference/plain.xdot           |     12 +
> tests/regression_tests/shapes/reference/plaintext.gv         |      9 +
> tests/regression_tests/shapes/reference/plaintext.svg        |     17 +
> tests/regression_tests/shapes/reference/plaintext.xdot       |     12 +
> tests/regression_tests/shapes/reference/point.gv             |      9 +
> tests/regression_tests/shapes/reference/point.svg            |     18 +
> tests/regression_tests/shapes/reference/point.xdot           |     13 +
> tests/regression_tests/shapes/reference/polygon.gv           |      9 +
> tests/regression_tests/shapes/reference/polygon.svg          |     18 +
> tests/regression_tests/shapes/reference/polygon.xdot         |     13 +
> tests/regression_tests/shapes/reference/primersite.gv        |      9 +
> tests/regression_tests/shapes/reference/primersite.svg       |     19 +
> tests/regression_tests/shapes/reference/primersite.xdot      |     13 +
> tests/regression_tests/shapes/reference/promoter.gv          |      9 +
> tests/regression_tests/shapes/reference/promoter.svg         |     19 +
> tests/regression_tests/shapes/reference/promoter.xdot        |     13 +
> tests/regression_tests/shapes/reference/proteasesite.gv      |      9 +
> tests/regression_tests/shapes/reference/proteasesite.svg     |     20 +
> tests/regression_tests/shapes/reference/proteasesite.xdot    |     14 +
> tests/regression_tests/shapes/reference/proteinstab.gv       |      9 +
> tests/regression_tests/shapes/reference/proteinstab.svg      |     20 +
> tests/regression_tests/shapes/reference/proteinstab.xdot     |     14 +
> tests/regression_tests/shapes/reference/rarrow.gv            |      9 +
> tests/regression_tests/shapes/reference/rarrow.svg           |     18 +
> tests/regression_tests/shapes/reference/rarrow.xdot          |     13 +
> tests/regression_tests/shapes/reference/rect.gv              |      9 +
> tests/regression_tests/shapes/reference/rect.svg             |     18 +
> tests/regression_tests/shapes/reference/rect.xdot            |     13 +
> tests/regression_tests/shapes/reference/rectangle.gv         |      9 +
> tests/regression_tests/shapes/reference/rectangle.svg        |     18 +
> tests/regression_tests/shapes/reference/rectangle.xdot       |     13 +
> tests/regression_tests/shapes/reference/restrictionsite.gv   |      9 +
> tests/regression_tests/shapes/reference/restrictionsite.svg  |     20 +
> tests/regression_tests/shapes/reference/restrictionsite.xdot |     14 +
> tests/regression_tests/shapes/reference/ribosite.gv          |      9 +
> tests/regression_tests/shapes/reference/ribosite.svg         |     21 +
> tests/regression_tests/shapes/reference/ribosite.xdot        |     14 +
> tests/regression_tests/shapes/reference/rnastab.gv           |      9 +
> tests/regression_tests/shapes/reference/rnastab.svg          |     21 +
> tests/regression_tests/shapes/reference/rnastab.xdot         |     14 +
> tests/regression_tests/shapes/reference/rpromoter.gv         |      9 +
> tests/regression_tests/shapes/reference/rpromoter.svg        |     18 +
> tests/regression_tests/shapes/reference/rpromoter.xdot       |     13 +
> tests/regression_tests/shapes/reference/septagon.gv          |      9 +
> tests/regression_tests/shapes/reference/septagon.svg         |     18 +
> tests/regression_tests/shapes/reference/septagon.xdot        |     13 +
> tests/regression_tests/shapes/reference/signature.gv         |      9 +
> tests/regression_tests/shapes/reference/signature.svg        |     21 +
> tests/regression_tests/shapes/reference/signature.xdot       |     13 +
> tests/regression_tests/shapes/reference/square.gv            |      9 +
> tests/regression_tests/shapes/reference/square.svg           |     18 +
> tests/regression_tests/shapes/reference/square.xdot          |     13 +
> tests/regression_tests/shapes/reference/star.gv              |      9 +
> tests/regression_tests/shapes/reference/star.svg             |     18 +
> tests/regression_tests/shapes/reference/star.xdot            |     13 +
> tests/regression_tests/shapes/reference/tab.gv               |      9 +
> tests/regression_tests/shapes/reference/tab.svg              |     19 +
> tests/regression_tests/shapes/reference/tab.xdot             |     13 +
> tests/regression_tests/shapes/reference/terminator.gv        |      9 +
> tests/regression_tests/shapes/reference/terminator.svg       |     19 +
> tests/regression_tests/shapes/reference/terminator.xdot      |     13 +
> tests/regression_tests/shapes/reference/threepoverhang.gv    |      9 +
> tests/regression_tests/shapes/reference/threepoverhang.svg   |     20 +
> tests/regression_tests/shapes/reference/threepoverhang.xdot  |     13 +
> tests/regression_tests/shapes/reference/trapezium.gv         |      9 +
> tests/regression_tests/shapes/reference/trapezium.svg        |     18 +
> tests/regression_tests/shapes/reference/trapezium.xdot       |     13 +
> tests/regression_tests/shapes/reference/triangle.gv          |      9 +
> tests/regression_tests/shapes/reference/triangle.svg         |     18 +
> tests/regression_tests/shapes/reference/triangle.xdot        |     13 +
> tests/regression_tests/shapes/reference/tripleoctagon.gv     |      9 +
> tests/regression_tests/shapes/reference/tripleoctagon.svg    |     20 +
> tests/regression_tests/shapes/reference/tripleoctagon.xdot   |     14 +
> tests/regression_tests/shapes/reference/underline.gv         |      9 +
> tests/regression_tests/shapes/reference/underline.svg        |     19 +
> tests/regression_tests/shapes/reference/underline.xdot       |     13 +
> tests/regression_tests/shapes/reference/utr.gv               |      9 +
> tests/regression_tests/shapes/reference/utr.svg              |     19 +
> tests/regression_tests/shapes/reference/utr.xdot             |     13 +
> tests/regression_tests/shapes/shapes.py                      |    121 +
> tests/unit_tests/Makefile.am                                 |      4 +
> tests/unit_tests/lib/Makefile.am                             |      4 +
> tests/unit_tests/lib/common/Makefile.am                      |     27 +
> tests/unit_tests/lib/common/command_line.c                   |    229 +
> windows/CMakeLists.txt                                       |      1 +
> windows/FEATURE/sfio                                         |     31 -
> windows/FEATURE/vmalloc                                      |     17 -
> windows/ast_common.h                                         |    145 -
> windows/bin/build.sh                                         |   1566 +-
> windows/bin/gsetup.sh                                        |     94 +-
> windows/build.bat                                            |    290 +-
> windows/build_stable.bat                                     |    210 +-
> windows/builddate.h                                          |      1 -
> windows/cmd/gvui/GVUI.vbp                                    |     92 +-
> windows/cmd/gvui/GVUI.vbw                                    |     18 +-
> windows/cmd/gvui/frmLayoutControl.frm                        |      2 +-
> windows/cmd/lefty/dot2l/dotparse.c                           |      6 +-
> windows/config.h                                             |    500 -
> windows/dependencies/graphviz-build-utilities                |      1 +
> windows/dependencies/libraries                               |      1 +
> windows/getopt.h                                             |     34 -
> windows/getopt/CMakeLists.txt                                |     13 +
> windows/getopt/getopt.c                                      |     58 +
> windows/getopt/getopt.h                                      |     20 +
> windows/getopt/getopt.vcxproj                                |    128 +
> windows/getopt/getopt.vcxproj.filters                        |     27 +
> windows/graphviz-msi/setup/setup.sln                         |     40 +-
> windows/graphviz-msi/setup/setup.vdproj                      |  38660 +++---
> windows/graphviz-msi/setup/setup_stable.sln                  |     40 +-
> windows/graphviz-msi/setup/setup_stable.vdproj               |  38422 +++---
> windows/gvedit/USettings.cpp                                 |      4 +-
> windows/include/FEATURE/sfio                                 |     13 +
> windows/include/builddate.h                                  |      1 +
> windows/include/config.h                                     |    355 +
> windows/include/exop.h                                       |     80 +
> windows/include/gdefs.h                                      |    485 +
> windows/include/ps_font_equiv.h                              |     46 +
> windows/include/unistd.h                                     |     50 +
> windows/libann/dll.vcproj                                    |    588 -
> windows/prebuild/iconv.patch                                 |     66 +-
> windows/ws/graphviz.dsw                                      |    514 +-
> windows/ws/tools.dsw                                         |    418 +-
> 1781 files changed, 606216 insertions(+), 576015 deletions(-)
> create mode 100644 .gitattributes
> create mode 100644 .gitlab-ci.yml
> create mode 100644 .gitmodules
> delete mode 100644 .hgignore
> create mode 100644 .tito/packages/.readme
> create mode 100644 .tito/tito.props
> create mode 100644 CMakeLists.txt
> delete mode 100644 Config.mk.old
> delete mode 100644 INSTALL.old
> delete mode 100644 Makefile.old
> delete mode 100644 ast_common.h.in
> create mode 100755 ci/autotools-build_and_test.sh
> create mode 100644 ci/centos7/Dockerfile
> create mode 100755 ci/cmake-build_and_test.sh
> create mode 100644 cmake/FindANN.cmake
> create mode 100644 cmake/FindAWK.cmake
> create mode 100644 cmake/FindCairo.cmake
> create mode 100644 cmake/FindGD.cmake
> create mode 100644 cmake/FindLTDL.cmake
> create mode 100644 cmake/FindNSIS.cmake
> create mode 100644 cmake/FindPangoCairo.cmake
> create mode 100644 cmake/FindRxSpencer.cmake
> create mode 100644 cmake/cmake_uninstall.cmake.in
> create mode 100644 cmake/config_checks.cmake
> create mode 100644 cmake/generate_color_lib.cmake.in
> create mode 100644 cmake/modify_cgraph_grammar.cmake.in
> create mode 100644 cmake/modify_cgraph_scan.cmake.in
> create mode 100644 cmake/modify_common_htmlparse.cmake.in
> create mode 100644 cmake/modify_gml2gv_gmlparse.cmake.in
> create mode 100644 cmake/modify_gml2gv_gmlscan.cmake.in
> create mode 100644 cmake/package_info.cmake
> create mode 100644 cmd/CMakeLists.txt
> delete mode 100644 cmd/Makefile.old
> create mode 100644 cmd/dot/CMakeLists.txt
> delete mode 100644 cmd/dot/Makefile.old
> delete mode 100644 cmd/dot/dot.vcproj
> create mode 100644 cmd/dot/dot.vcxproj
> create mode 100644 cmd/dot/dot.vcxproj.filters
> delete mode 100644 cmd/dotty/Makefile.old
> delete mode 100644 cmd/dotty/dotty.vcproj
> create mode 100644 cmd/dotty/dotty.vcxproj
> create mode 100644 cmd/dotty/dotty.vcxproj.filters
> delete mode 100644 cmd/edgepaint/edgepaint.vcproj
> create mode 100644 cmd/edgepaint/edgepaint.vcxproj
> create mode 100644 cmd/edgepaint/edgepaint.vcxproj.filters
> delete mode 100644 cmd/gvedit/gvedit.vcproj
> create mode 100644 cmd/gvedit/gvedit.vcxproj
> create mode 100644 cmd/gvedit/gvedit.vcxproj.filters
> delete mode 100644 cmd/gvmap/gvmap.vcproj
> delete mode 100644 cmd/gvmap/gvmap.vcproj.RESEARCH.arif.user
> delete mode 100644 cmd/gvmap/gvmap.vcproj.user
> create mode 100644 cmd/gvmap/gvmap.vcxproj
> create mode 100644 cmd/gvmap/gvmap.vcxproj.filters
> delete mode 100644 cmd/gvpr/Makefile.old
> delete mode 100644 cmd/gvpr/gvpr.vcproj
> create mode 100644 cmd/gvpr/gvpr.vcxproj
> create mode 100644 cmd/gvpr/gvpr.vcxproj.filters
> create mode 100644 cmd/gvpr/lib/clustg
> delete mode 100644 cmd/lefty/Makefile.old
> delete mode 100644 cmd/lefty/lefty.vcproj
> create mode 100644 cmd/lefty/lefty.vcxproj
> create mode 100644 cmd/lefty/lefty.vcxproj.filters
> delete mode 100644 cmd/lneato/Makefile.old
> delete mode 100644 cmd/lneato/lneato.vcproj
> create mode 100644 cmd/lneato/lneato.vcxproj
> create mode 100644 cmd/lneato/lneato.vcxproj.filters
> delete mode 100644 cmd/mingle/mingle.vcproj
> create mode 100644 cmd/mingle/mingle.vcxproj
> create mode 100644 cmd/mingle/mingle.vcxproj.filters
> mode change 100755 => 100644 cmd/smyrna/draw.c
> mode change 100755 => 100644 cmd/smyrna/draw.h
> mode change 100755 => 100644 cmd/smyrna/gltemplate.c
> mode change 100755 => 100644 cmd/smyrna/gltemplate.h
> mode change 100755 => 100644 cmd/smyrna/gui/callbacks.c
> mode change 100755 => 100644 cmd/smyrna/gui/callbacks.h
> mode change 100755 => 100644 cmd/smyrna/gui/datalistcallbacks.c
> mode change 100755 => 100644 cmd/smyrna/gui/datalistcallbacks.h
> mode change 100755 => 100644 cmd/smyrna/gui/gui.c
> mode change 100755 => 100644 cmd/smyrna/gui/menucallbacks.c
> mode change 100755 => 100644 cmd/smyrna/gui/menucallbacks.h
> mode change 100755 => 100644 cmd/smyrna/gui/toolboxcallbacks.c
> mode change 100755 => 100644 cmd/smyrna/gui/toolboxcallbacks.h
> mode change 100755 => 100644 cmd/smyrna/main.c
> mode change 100755 => 100644 cmd/smyrna/materials.h
> delete mode 100644 cmd/smyrna/smyrna.vcproj
> delete mode 100644 cmd/smyrna/smyrna.vcproj.RESEARCH.arif.user
> create mode 100644 cmd/smyrna/smyrna.vcxproj
> create mode 100644 cmd/smyrna/smyrna.vcxproj.filters
> mode change 100755 => 100644 cmd/smyrna/support.c
> mode change 100755 => 100644 cmd/smyrna/support.h
> mode change 100755 => 100644 cmd/smyrna/trackball.c
> mode change 100755 => 100644 cmd/smyrna/trackball.h
> mode change 100755 => 100644 cmd/smyrna/tvnodes.c
> mode change 100755 => 100644 cmd/smyrna/tvnodes.h
> mode change 100755 => 100644 cmd/smyrna/viewport.c
> mode change 100755 => 100644 cmd/smyrna/viewport.h
> create mode 100644 cmd/tools/CMakeLists.txt
> delete mode 100644 cmd/tools/Makefile.old
> delete mode 100644 cmd/tools/acyclic.vcproj
> create mode 100644 cmd/tools/acyclic.vcxproj
> create mode 100644 cmd/tools/acyclic.vcxproj.filters
> delete mode 100644 cmd/tools/bcomps.vcproj
> create mode 100644 cmd/tools/bcomps.vcxproj
> create mode 100644 cmd/tools/bcomps.vcxproj.filters
> delete mode 100644 cmd/tools/ccomps.vcproj
> create mode 100644 cmd/tools/ccomps.vcxproj
> create mode 100644 cmd/tools/ccomps.vcxproj.filters
> delete mode 100644 cmd/tools/dijkstra.vcproj
> create mode 100644 cmd/tools/dijkstra.vcxproj
> create mode 100644 cmd/tools/dijkstra.vcxproj.filters
> delete mode 100644 cmd/tools/gc.vcproj
> create mode 100644 cmd/tools/gc.vcxproj
> create mode 100644 cmd/tools/gc.vcxproj.filters
> delete mode 100644 cmd/tools/gml2gv.vcproj
> delete mode 100644 cmd/tools/gml2gv.vcproj.RESEARCH.arif.user
> delete mode 100644 cmd/tools/gml2gv.vcproj.user
> create mode 100644 cmd/tools/gml2gv.vcxproj
> create mode 100644 cmd/tools/gml2gv.vcxproj.filters
> delete mode 100644 cmd/tools/graphml2gv.vcproj
> create mode 100644 cmd/tools/graphml2gv.vcxproj
> create mode 100644 cmd/tools/graphml2gv.vcxproj.filters
> delete mode 100644 cmd/tools/gv2gml.vcproj
> create mode 100644 cmd/tools/gv2gml.vcxproj
> create mode 100644 cmd/tools/gv2gml.vcxproj.filters
> delete mode 100644 cmd/tools/gv2gxl.vcproj
> delete mode 100644 cmd/tools/gvcolor.vcproj
> create mode 100644 cmd/tools/gvcolor.vcxproj
> create mode 100644 cmd/tools/gvcolor.vcxproj.filters
> delete mode 100644 cmd/tools/gvgen.vcproj
> create mode 100644 cmd/tools/gvgen.vcxproj
> create mode 100644 cmd/tools/gvgen.vcxproj.filters
> delete mode 100644 cmd/tools/gvpack.vcproj
> create mode 100644 cmd/tools/gvpack.vcxproj
> create mode 100644 cmd/tools/gvpack.vcxproj.filters
> delete mode 100644 cmd/tools/gxl2gv.vcproj
> create mode 100644 cmd/tools/gxl2gv.vcxproj
> create mode 100644 cmd/tools/gxl2gv.vcxproj.filters
> delete mode 100644 cmd/tools/mm2gv.vcproj
> create mode 100644 cmd/tools/mm2gv.vcxproj
> create mode 100644 cmd/tools/mm2gv.vcxproj.filters
> delete mode 100644 cmd/tools/nop.vcproj
> create mode 100644 cmd/tools/nop.vcxproj
> create mode 100644 cmd/tools/nop.vcxproj.filters
> delete mode 100644 cmd/tools/sccmap.vcproj
> create mode 100644 cmd/tools/sccmap.vcxproj
> create mode 100644 cmd/tools/sccmap.vcxproj.filters
> delete mode 100644 cmd/tools/tred.vcproj
> create mode 100644 cmd/tools/tred.vcxproj
> create mode 100644 cmd/tools/tred.vcxproj.filters
> create mode 100644 cmd/tools/tred2.c
> delete mode 100644 cmd/tools/unflatten.vcproj
> create mode 100644 cmd/tools/unflatten.vcxproj
> create mode 100644 cmd/tools/unflatten.vcxproj.filters
> delete mode 100644 compat_getopt.h
> create mode 100644 config-cmake.h.in
> delete mode 100644 config.h.old
> delete mode 100755 configure.old
> delete mode 100644 contrib/Makefile.old
> delete mode 100644 contrib/diffimg/diffimg.vcproj
> create mode 100644 contrib/diffimg/diffimg.vcxproj
> create mode 100644 contrib/diffimg/diffimg.vcxproj.filters
> delete mode 100644 contrib/dirgraph/Makefile.old
> delete mode 100644 contrib/lefty-grace/Makefile.old
> delete mode 100644 contrib/prune/Makefile.old
> delete mode 100644 contrib/prune/prune.vcproj
> create mode 100644 contrib/prune/prune.vcxproj
> create mode 100644 contrib/prune/prune.vcxproj.filters
> create mode 160000 dependencies/criterion
> create mode 100644 doc/info/graphviz_json_schema.json
> create mode 100644 doc/info/schema.html
> create mode 100644 doc/info/w3data.js
> create mode 100644 doc/infosrc/Makefile
> delete mode 100644 doc/infosrc/Makefile.old
> create mode 100644 doc/infosrc/graphviz_json_schema.json
> create mode 100755 doc/infosrc/jconvert.py
> create mode 100644 doc/infosrc/w3data.js
> delete mode 100644 features/common
> create mode 120000 graphviz.spec
> delete mode 100644 graphviz.spec.in
> delete mode 100644 graphviz.vcproj
> create mode 100644 graphviz_version.h.cmake
> create mode 100644 index.html
> create mode 100644 lib/CMakeLists.txt
> delete mode 100644 lib/Makefile.old
> delete mode 100644 lib/agraph/Makefile.old
> delete mode 100644 lib/agutil/Makefile.old
> delete mode 100644 lib/ast/Makefile.old
> delete mode 100644 lib/ast/ast.vcproj
> create mode 100644 lib/ast/ast.vcxproj
> create mode 100644 lib/ast/ast.vcxproj.filters
> delete mode 100644 lib/ast/strerror.c
> create mode 100644 lib/cdt/CMakeLists.txt
> delete mode 100644 lib/cdt/Cdt_ex/data
> delete mode 100644 lib/cdt/Cdt_ex/uniqword.c
> delete mode 100644 lib/cdt/Cdt_p/hsearch.c
> delete mode 100644 lib/cdt/Cdt_p/tsearch.c
> delete mode 100644 lib/cdt/Cdt_t/dttest.h
> delete mode 100755 lib/cdt/Cdt_t/runtest
> delete mode 100644 lib/cdt/Cdt_t/terror.h
> delete mode 100644 lib/cdt/Cdt_t/tevent.c
> delete mode 100644 lib/cdt/Cdt_t/tobag.c
> delete mode 100644 lib/cdt/Cdt_t/tqueue.c
> delete mode 100644 lib/cdt/Cdt_t/trenew.c
> delete mode 100644 lib/cdt/Cdt_t/tsearch.c
> delete mode 100644 lib/cdt/Cdt_t/tshare.c
> delete mode 100644 lib/cdt/Cdt_t/tstack.c
> delete mode 100644 lib/cdt/Cdt_t/tview.c
> delete mode 100644 lib/cdt/Makefile.old
> delete mode 100644 lib/cdt/cdt.def
> delete mode 100644 lib/cdt/cdt.vcproj
> create mode 100644 lib/cdt/cdt.vcxproj
> create mode 100644 lib/cdt/cdt.vcxproj.filters
> delete mode 100644 lib/cdt/dttreeset.c
> delete mode 100644 lib/cdt/features/common
> create mode 100644 lib/cgraph/CMakeLists.txt
> delete mode 100644 lib/cgraph/Makefile.old
> delete mode 100644 lib/cgraph/cgraph.def
> delete mode 100644 lib/cgraph/cgraph.vcproj
> create mode 100644 lib/cgraph/cgraph.vcxproj
> create mode 100644 lib/cgraph/cgraph.vcxproj.filters
> mode change 100755 => 100644 lib/cgraph/obj.c
> delete mode 100644 lib/cgraph/vmstub.h
> create mode 100644 lib/circogen/CMakeLists.txt
> delete mode 100644 lib/circogen/Makefile.old
> delete mode 100644 lib/circogen/gvcircogen.vcproj
> create mode 100644 lib/circogen/gvcircogen.vcxproj
> create mode 100644 lib/circogen/gvcircogen.vcxproj.filters
> create mode 100644 lib/common/CMakeLists.txt
> delete mode 100644 lib/common/Makefile.old
> create mode 100644 lib/common/timing.h
> create mode 100644 lib/common/types.h
> delete mode 100644 lib/common/types.h.in
> create mode 100644 lib/dotgen/CMakeLists.txt
> delete mode 100644 lib/dotgen/Makefile.old
> delete mode 100644 lib/dotgen/gvdotgen.vcproj
> create mode 100644 lib/dotgen/gvdotgen.vcxproj
> create mode 100644 lib/dotgen/gvdotgen.vcxproj.filters
> delete mode 100644 lib/edgepaint/edgepaintlib.vcproj
> create mode 100644 lib/edgepaint/edgepaintlib.vcxproj
> create mode 100644 lib/edgepaint/edgepaintlib.vcxproj.filters
> delete mode 100644 lib/edgepaint/lab_gamut.vcproj
> create mode 100644 lib/edgepaint/lab_gamut.vcxproj
> create mode 100644 lib/edgepaint/lab_gamut.vcxproj.filters
> delete mode 100644 lib/expr/Makefile.old
> delete mode 100644 lib/expr/expr.vcproj
> create mode 100644 lib/expr/expr.vcxproj
> create mode 100644 lib/expr/expr.vcxproj.filters
> create mode 100644 lib/fdpgen/CMakeLists.txt
> delete mode 100644 lib/fdpgen/Makefile.old
> delete mode 100644 lib/fdpgen/gvfdpgen.vcproj
> create mode 100644 lib/fdpgen/gvfdpgen.vcxproj
> create mode 100644 lib/fdpgen/gvfdpgen.vcxproj.filters
> delete mode 100644 lib/gd/COPYING
> delete mode 100644 lib/gd/INSTALL
> delete mode 100644 lib/gd/Makefile.am
> delete mode 100644 lib/gd/Makefile.old
> delete mode 100644 lib/gd/README-JPEG.TXT
> delete mode 100644 lib/gd/README.TXT
> delete mode 100644 lib/gd/aclocal.m4
> delete mode 100644 lib/gd/annotate.c
> delete mode 100644 lib/gd/bdftogd
> delete mode 100644 lib/gd/circletexttest.c
> delete mode 100644 lib/gd/config.hin
> delete mode 100644 lib/gd/config/Makefile.am
> delete mode 100755 lib/gd/config/config.guess
> delete mode 100644 lib/gd/config/config.rpath
> delete mode 100755 lib/gd/config/config.sub
> delete mode 100755 lib/gd/config/depcomp
> delete mode 100644 lib/gd/config/gdlib-config.in
> delete mode 100755 lib/gd/config/install-sh
> delete mode 100644 lib/gd/config/ltmain.sh
> delete mode 100755 lib/gd/config/missing
> delete mode 100755 lib/gd/config/mkinstalldirs
> delete mode 100755 lib/gd/configure
> delete mode 100644 lib/gd/configure.ac
> delete mode 100755 lib/gd/configure.pl
> delete mode 100644 lib/gd/demoin.png
> delete mode 100644 lib/gd/depcomp
> delete mode 100644 lib/gd/entities.h
> delete mode 100644 lib/gd/entities.html
> delete mode 100755 lib/gd/entities.tcl
> delete mode 100644 lib/gd/err.out
> delete mode 100644 lib/gd/fontconfigtest.c
> delete mode 100644 lib/gd/fontsizetest.c
> delete mode 100644 lib/gd/fontwheeltest.c
> delete mode 100644 lib/gd/gd-2.0.33.patch
> delete mode 100644 lib/gd/gd.c
> delete mode 100644 lib/gd/gd.h
> delete mode 100644 lib/gd/gd.vcproj
> delete mode 100644 lib/gd/gd2copypal.c
> delete mode 100644 lib/gd/gd2time.c
> delete mode 100644 lib/gd/gd2togif.c
> delete mode 100644 lib/gd/gd2topng.c
> delete mode 100644 lib/gd/gd_gd.c
> delete mode 100644 lib/gd/gd_gd2.c
> delete mode 100644 lib/gd/gd_gif_in.c
> delete mode 100644 lib/gd/gd_gif_out.c
> delete mode 100644 lib/gd/gd_io.c
> delete mode 100644 lib/gd/gd_io.h
> delete mode 100644 lib/gd/gd_io_dp.c
> delete mode 100644 lib/gd/gd_io_file.c
> delete mode 100644 lib/gd/gd_io_ss.c
> delete mode 100644 lib/gd/gd_jpeg.c
> delete mode 100644 lib/gd/gd_png.c
> delete mode 100644 lib/gd/gd_security.c
> delete mode 100644 lib/gd/gd_ss.c
> delete mode 100644 lib/gd/gd_topal.c
> delete mode 100644 lib/gd/gd_wbmp.c
> delete mode 100644 lib/gd/gdcache.c
> delete mode 100644 lib/gd/gdcache.h
> delete mode 100644 lib/gd/gdcmpgif.c
> delete mode 100644 lib/gd/gddemo.c
> delete mode 100644 lib/gd/gdfontg.c
> delete mode 100644 lib/gd/gdfontg.h
> delete mode 100644 lib/gd/gdfontl.c
> delete mode 100644 lib/gd/gdfontl.h
> delete mode 100644 lib/gd/gdfontmb.c
> delete mode 100644 lib/gd/gdfontmb.h
> delete mode 100644 lib/gd/gdfonts.c
> delete mode 100644 lib/gd/gdfonts.h
> delete mode 100644 lib/gd/gdfontt.c
> delete mode 100644 lib/gd/gdfontt.h
> delete mode 100644 lib/gd/gdft.c
> delete mode 100644 lib/gd/gdfx.c
> delete mode 100644 lib/gd/gdfx.h
> delete mode 100644 lib/gd/gdhelpers.c
> delete mode 100644 lib/gd/gdhelpers.h
> delete mode 100644 lib/gd/gdkanji.c
> delete mode 100644 lib/gd/gdparttopng.c
> delete mode 100644 lib/gd/gdtables.c
> delete mode 100644 lib/gd/gdtest.c
> delete mode 100644 lib/gd/gdtestft.c
> delete mode 100644 lib/gd/gdtopng.c
> delete mode 100644 lib/gd/gdxpm.c
> delete mode 100644 lib/gd/gifanimtest.c
> delete mode 100644 lib/gd/giftogd2.c
> delete mode 100644 lib/gd/index.html
> delete mode 100644 lib/gd/install-item
> delete mode 100644 lib/gd/install-sh
> delete mode 100644 lib/gd/jisx0208.h
> delete mode 100755 lib/gd/makefile.sample
> delete mode 100644 lib/gd/missing
> delete mode 100644 lib/gd/mkinstalldirs
> delete mode 100644 lib/gd/pngtogd.c
> delete mode 100644 lib/gd/pngtogd2.c
> delete mode 100644 lib/gd/readme.jpn
> delete mode 100644 lib/gd/test/Makefile.am
> delete mode 100644 lib/gd/test/gdtest.gd2
> delete mode 100644 lib/gd/test/gdtest.png
> delete mode 100644 lib/gd/test/gdtest_200_300_150_100.png
> delete mode 100644 lib/gd/test/gdtest_merge.png
> delete mode 100644 lib/gd/test/gdtest_wbmp_to_png.png
> delete mode 100644 lib/gd/testac.c
> delete mode 100644 lib/gd/testtr.c
> delete mode 100644 lib/gd/wbmp.c
> delete mode 100644 lib/gd/wbmp.h
> delete mode 100644 lib/gd/webpng.c
> delete mode 100644 lib/glcomp/glcomp.vcproj
> create mode 100644 lib/glcomp/glcomp.vcxproj
> create mode 100644 lib/glcomp/glcomp.vcxproj.filters
> delete mode 100644 lib/graph/Makefile.old
> delete mode 100644 lib/gvc.vcproj
> delete mode 100644 lib/gvc.vcproj.RESEARCH.arif.user
> create mode 100644 lib/gvc.vcxproj
> create mode 100644 lib/gvc.vcxproj.filters
> create mode 100644 lib/gvc/CMakeLists.txt
> delete mode 100644 lib/gvc/Makefile.old
> create mode 100644 lib/gvc/gvc.def
> delete mode 100644 lib/gvc/gvc.vcproj
> create mode 100644 lib/gvc/gvtool_tred.c
> delete mode 100644 lib/gvc/regex_win32.c
> delete mode 100644 lib/gvc/regex_win32.h
> delete mode 100644 lib/gvpr/Makefile.old
> delete mode 100644 lib/gvpr/gvprlib.vcproj
> create mode 100644 lib/gvpr/gvprlib.vcxproj
> create mode 100644 lib/gvpr/gvprlib.vcxproj.filters
> create mode 100644 lib/ingraphs/CMakeLists.txt
> delete mode 100644 lib/ingraphs/Makefile.old
> delete mode 100644 lib/ingraphs/ingraphs.vcproj
> create mode 100644 lib/ingraphs/ingraphs.vcxproj
> create mode 100644 lib/ingraphs/ingraphs.vcxproj.filters
> delete mode 100644 lib/inkpot/Makefile.old
> create mode 100644 lib/label/CMakeLists.txt
> create mode 100644 lib/mingle/CMakeLists.txt
> delete mode 100644 lib/mingle/minglelib.vcproj
> create mode 100644 lib/mingle/minglelib.vcxproj
> create mode 100644 lib/mingle/minglelib.vcxproj.filters
> create mode 100644 lib/neatogen/CMakeLists.txt
> delete mode 100644 lib/neatogen/Makefile.old
> delete mode 100644 lib/neatogen/gvneatogen.vcproj
> create mode 100644 lib/neatogen/gvneatogen.vcxproj
> create mode 100644 lib/neatogen/gvneatogen.vcxproj.filters
> create mode 100644 lib/ortho/CMakeLists.txt
> delete mode 100644 lib/ortho/Makefile.old
> delete mode 100644 lib/ortho/gvortho.vcproj
> create mode 100644 lib/ortho/gvortho.vcxproj
> create mode 100644 lib/ortho/gvortho.vcxproj.filters
> create mode 100644 lib/osage/CMakeLists.txt
> delete mode 100644 lib/osage/Makefile.old
> delete mode 100644 lib/osage/osage.vcproj
> create mode 100644 lib/osage/osage.vcxproj
> create mode 100644 lib/osage/osage.vcxproj.filters
> create mode 100644 lib/pack/CMakeLists.txt
> delete mode 100644 lib/pack/Makefile.old
> create mode 100644 lib/patchwork/CMakeLists.txt
> delete mode 100644 lib/patchwork/Makefile.old
> delete mode 100644 lib/patchwork/gvpatchwork.vcproj
> create mode 100644 lib/patchwork/gvpatchwork.vcxproj
> create mode 100644 lib/patchwork/gvpatchwork.vcxproj.filters
> create mode 100644 lib/pathplan/CMakeLists.txt
> delete mode 100644 lib/pathplan/Makefile.old
> delete mode 100644 lib/pathplan/Pathplan.vcproj
> create mode 100644 lib/pathplan/Pathplan.vcxproj
> create mode 100644 lib/pathplan/Pathplan.vcxproj.filters
> create mode 100644 lib/rbtree/CMakeLists.txt
> delete mode 100644 lib/rbtree/Makefile.old
> mode change 100755 => 100644 lib/rbtree/misc.c
> mode change 100755 => 100644 lib/rbtree/misc.h
> delete mode 100644 lib/rbtree/rbtree.vcproj
> create mode 100644 lib/rbtree/rbtree.vcxproj
> create mode 100644 lib/rbtree/rbtree.vcxproj.filters
> mode change 100755 => 100644 lib/rbtree/red_black_tree.c
> mode change 100755 => 100644 lib/rbtree/red_black_tree.h
> mode change 100755 => 100644 lib/rbtree/stack.c
> mode change 100755 => 100644 lib/rbtree/stack.h
> mode change 100755 => 100644 lib/rbtree/test_red_black_tree.c
> create mode 100644 lib/sfdpgen/CMakeLists.txt
> delete mode 100644 lib/sfdpgen/Makefile.old
> delete mode 100644 lib/sfdpgen/sfdp.vcproj
> create mode 100644 lib/sfdpgen/sfdp.vcxproj
> create mode 100644 lib/sfdpgen/sfdp.vcxproj.filters
> delete mode 100644 lib/sfio/Makefile.old
> delete mode 100644 lib/sfio/Makefile.orig
> delete mode 100644 lib/sfio/Sfio_dc/Makefile.old
> delete mode 100644 lib/sfio/Sfio_dc/sfdcdio.c
> delete mode 100644 lib/sfio/Sfio_f/Makefile.old
> delete mode 100644 lib/sfio/features/common
> delete mode 100644 lib/sfio/features/stdio
> delete mode 100644 lib/sfio/sfio.vcproj
> create mode 100644 lib/sfio/sfio.vcxproj
> create mode 100644 lib/sfio/sfio.vcxproj.filters
> create mode 100644 lib/sparse/CMakeLists.txt
> delete mode 100644 lib/sparse/Makefile.old
> delete mode 100644 lib/sparse/gvsparse.vcproj
> create mode 100644 lib/sparse/gvsparse.vcxproj
> create mode 100644 lib/sparse/gvsparse.vcxproj.filters
> create mode 100644 lib/spine/CMakeLists.txt
> create mode 100644 lib/spine/Makefile.am
> create mode 100644 lib/spine/quad.c
> create mode 100644 lib/spine/quad.h
> create mode 100644 lib/spine/spine.c
> create mode 100644 lib/spine/spine.h
> create mode 100644 lib/spine/spine.vcxproj
> create mode 100644 lib/spine/spine.vcxproj.filters
> create mode 100644 lib/spine/spinehdr.h
> create mode 100644 lib/spine/subset.c
> create mode 100644 lib/spine/subset.h
> create mode 100644 lib/spine/union_find.c
> create mode 100644 lib/spine/union_find.h
> create mode 100644 lib/topfish/CMakeLists.txt
> delete mode 100644 lib/topfish/topfish.vcproj
> create mode 100644 lib/topfish/topfish.vcxproj
> create mode 100644 lib/topfish/topfish.vcxproj.filters
> create mode 100644 lib/twopigen/CMakeLists.txt
> delete mode 100644 lib/twopigen/Makefile.old
> delete mode 100644 lib/twopigen/gvtwopigen.vcproj
> create mode 100644 lib/twopigen/gvtwopigen.vcxproj
> create mode 100644 lib/twopigen/gvtwopigen.vcxproj.filters
> create mode 100644 lib/vmalloc/CMakeLists.txt
> delete mode 100644 lib/vmalloc/Makefile.old
> delete mode 100644 lib/vmalloc/features/common
> delete mode 100644 lib/vmalloc/features/vmalloc
> delete mode 100644 lib/vmalloc/vmalloc.vcproj
> create mode 100644 lib/vmalloc/vmalloc.vcxproj
> create mode 100644 lib/vmalloc/vmalloc.vcxproj.filters
> delete mode 100644 lib/vmalloc/vmexit.c
> create mode 100644 lib/vpsc/CMakeLists.txt
> delete mode 100644 lib/vpsc/Makefile.old
> delete mode 100644 lib/vpsc/vpsc.vcproj
> create mode 100644 lib/vpsc/vpsc.vcxproj
> create mode 100644 lib/vpsc/vpsc.vcxproj.filters
> create mode 100644 lib/xdot/CMakeLists.txt
> delete mode 100644 lib/xdot/Makefile.old
> mode change 100755 => 100644 lib/xdot/xdot.c
> mode change 100755 => 100644 lib/xdot/xdot.h
> delete mode 100644 lib/xdot/xdot.vcproj
> create mode 100644 lib/xdot/xdot.vcxproj
> create mode 100644 lib/xdot/xdot.vcxproj.filters
> create mode 100644 plugin/CMakeLists.txt
> delete mode 100644 plugin/Makefile.old
> create mode 100644 plugin/core/CMakeLists.txt
> delete mode 100644 plugin/core/Makefile.old
> delete mode 100644 plugin/core/gvplugin_core.def
> delete mode 100644 plugin/core/gvplugin_core.vcproj
> create mode 100644 plugin/core/gvplugin_core.vcxproj
> create mode 100644 plugin/core/gvplugin_core.vcxproj.filters
> delete mode 100644 plugin/core/plugincore.vcproj
> delete mode 100644 plugin/devil/Makefile.old
> create mode 100644 plugin/dot_layout/CMakeLists.txt
> delete mode 100644 plugin/dot_layout/Makefile.old
> delete mode 100644 plugin/dot_layout/gvplugin_dot_layout.def
> delete mode 100644 plugin/dot_layout/gvplugin_dot_layout.vcproj
> create mode 100644 plugin/dot_layout/gvplugin_dot_layout.vcxproj
> create mode 100644 plugin/dot_layout/gvplugin_dot_layout.vcxproj.filters
> create mode 100644 plugin/gd/CMakeLists.txt
> delete mode 100644 plugin/gd/Makefile.old
> delete mode 100644 plugin/gd/gvplugin_gd.def
> delete mode 100644 plugin/gd/gvplugin_gd.vcproj
> create mode 100644 plugin/gd/gvplugin_gd.vcxproj
> create mode 100644 plugin/gd/gvplugin_gd.vcxproj.filters
> create mode 100644 plugin/gdiplus/CMakeLists.txt
> delete mode 100644 plugin/gdiplus/gvplugin_gdiplus.def
> delete mode 100644 plugin/gdiplus/gvplugin_gdiplus.vcproj
> create mode 100644 plugin/gdiplus/gvplugin_gdiplus.vcxproj
> create mode 100644 plugin/gdiplus/gvplugin_gdiplus.vcxproj.filters
> delete mode 100644 plugin/gdk/Makefile.old
> delete mode 100644 plugin/gs/Makefile.old
> delete mode 100644 plugin/lasi/Makefile.old
> delete mode 100644 plugin/ming/Makefile.old
> create mode 100644 plugin/neato_layout/CMakeLists.txt
> delete mode 100644 plugin/neato_layout/Makefile.old
> delete mode 100644 plugin/neato_layout/gvplugin_neato_layout.def
> delete mode 100644 plugin/neato_layout/gvplugin_neato_layout.vcproj
> create mode 100644 plugin/neato_layout/gvplugin_neato_layout.vcxproj
> create mode 100644 plugin/neato_layout/gvplugin_neato_layout.vcxproj.filters
> create mode 100644 plugin/pango/CMakeLists.txt
> delete mode 100644 plugin/pango/Makefile.old
> delete mode 100644 plugin/pango/gvplugin_pango.vcproj
> create mode 100644 plugin/pango/gvplugin_pango.vcxproj
> create mode 100644 plugin/pango/gvplugin_pango.vcxproj.filters
> delete mode 100644 plugin/rsvg/Makefile.old
> delete mode 100644 plugin/visio/gvplugin_visio.vcproj
> create mode 100755 plugin/xlib/slow_graph_stream_test.sh
> create mode 100644 redhat/graphviz.spec.fedora.in
> create mode 120000 redhat/graphviz.spec.rhel.in
> delete mode 100644 rtest/FreeBSD.i386/dummy
> delete mode 100644 rtest/IRIX64.IP35.sgi_cc/dummy
> delete mode 100644 rtest/Linux.ia64.icc8.0/ER.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/Heawood.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/Heawood.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/NaN.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/alf.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/b106.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/b117.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b117a.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b124.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/b145.png
> delete mode 100644 rtest/Linux.ia64.icc8.0/b15.png
> delete mode 100644 rtest/Linux.ia64.icc8.0/b29.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/b33.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b34.gif
> delete mode 100644 rtest/Linux.ia64.icc8.0/b36.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/b51.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/b56.gif
> delete mode 100644 rtest/Linux.ia64.icc8.0/b57.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b60.gif
> delete mode 100644 rtest/Linux.ia64.icc8.0/b68.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b69.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b71.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/b81.svg
> delete mode 100644 rtest/Linux.ia64.icc8.0/big.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/biglabel.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/clust4.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/crazy.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/crazy.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/dpd.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/dpd1.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/dpd2.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/dpd3.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/dpd4.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/dpd5.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/jsort.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/lsunix1.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/lsunix2.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/lsunix3.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/newarrows.gif
> delete mode 100644 rtest/Linux.ia64.icc8.0/newarrows.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/p.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/p2.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/p3.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/p4.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/pgram.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/proc3d.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/process.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/record2.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/structs.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/structs.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/trapeziumlr.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/unix.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/unix.ps
> delete mode 100644 rtest/Linux.ia64.icc8.0/unix2.gv
> delete mode 100644 rtest/Linux.ia64.icc8.0/unix2k.gv
> create mode 100644 rtest/linux.x86/AvantGarde_dot.png
> create mode 100644 rtest/linux.x86/AvantGarde_dot.ps
> create mode 100644 rtest/linux.x86/Bookman_dot.png
> create mode 100644 rtest/linux.x86/Bookman_dot.ps
> create mode 100644 rtest/linux.x86/Courier_dot.png
> create mode 100644 rtest/linux.x86/Courier_dot.ps
> create mode 100644 rtest/linux.x86/Helvetica_dot.png
> create mode 100644 rtest/linux.x86/Helvetica_dot.ps
> create mode 100644 rtest/linux.x86/NewCenturySchlbk_dot.png
> create mode 100644 rtest/linux.x86/NewCenturySchlbk_dot.ps
> create mode 100644 rtest/linux.x86/Palatino_dot.png
> create mode 100644 rtest/linux.x86/Palatino_dot.ps
> create mode 100644 rtest/linux.x86/Symbol_dot.png
> create mode 100644 rtest/linux.x86/Times_dot.png
> create mode 100644 rtest/linux.x86/Times_dot.ps
> create mode 100644 rtest/linux.x86/ZapfChancery_dot.png
> create mode 100644 rtest/linux.x86/ZapfChancery_dot.ps
> create mode 100644 rtest/linux.x86/ZapfDingbats_dot.png
> create mode 100644 rtest/linux.x86/ZapfDingbats_dot.ps
> create mode 100644 rtest/linux.x86/arrows_dot.gv
> create mode 100644 rtest/linux.x86/arrows_dot.ps
> create mode 100644 rtest/linux.x86/arrowsize_dot.png
> create mode 100644 rtest/linux.x86/cairo_dot_cairo.png
> create mode 100644 rtest/linux.x86/cairo_dot_cairo.ps
> create mode 100644 rtest/linux.x86/cairo_dot_cairo.svg
> create mode 100644 rtest/linux.x86/center_dot.png
> create mode 100644 rtest/linux.x86/center_dot.ps
> create mode 100644 rtest/linux.x86/clusters_dot.png
> create mode 100644 rtest/linux.x86/clusters_dot.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot1.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot2.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot3.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot4.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot5.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot6.ps
> create mode 100644 rtest/linux.x86/clustlabel_dot7.ps
> create mode 100644 rtest/linux.x86/color_dot.png
> create mode 100644 rtest/linux.x86/color_dot1.png
> create mode 100644 rtest/linux.x86/colors_dot.ps
> create mode 100644 rtest/linux.x86/colorscheme_dot.png
> create mode 100644 rtest/linux.x86/colorscheme_dot.ps
> create mode 100644 rtest/linux.x86/compound_dot.gv
> create mode 100644 rtest/linux.x86/crazy_dot.png
> create mode 100644 rtest/linux.x86/crazy_dot.ps
> create mode 100644 rtest/linux.x86/decorate_dot.png
> create mode 100644 rtest/linux.x86/dir_dot.ps
> create mode 100644 rtest/linux.x86/dotsplines_dot.gv
> create mode 100644 rtest/linux.x86/dotsplines_dot1.gv
> create mode 100644 rtest/linux.x86/edgeclip_dot.gv
> create mode 100644 rtest/linux.x86/fdp_clus_fdp.png
> create mode 100644 rtest/linux.x86/flatedge_dot.gv
> create mode 100644 rtest/linux.x86/grdangles_dot.png
> create mode 100644 rtest/linux.x86/grdangles_dot.svg
> create mode 100644 rtest/linux.x86/grdcluster_dot.png
> create mode 100644 rtest/linux.x86/grdcluster_dot.svg
> create mode 100644 rtest/linux.x86/grdcolors_dot.png
> create mode 100644 rtest/linux.x86/grdcolors_dot.svg
> create mode 100644 rtest/linux.x86/grdfillcolor_dot.png
> create mode 100644 rtest/linux.x86/grdfillcolor_dot.svg
> create mode 100644 rtest/linux.x86/grdlinear_angle_dot.png
> create mode 100644 rtest/linux.x86/grdlinear_angle_dot.svg
> create mode 100644 rtest/linux.x86/grdlinear_dot.png
> create mode 100644 rtest/linux.x86/grdlinear_dot.svg
> create mode 100644 rtest/linux.x86/grdlinear_node_dot.png
> create mode 100644 rtest/linux.x86/grdlinear_node_dot.svg
> create mode 100644 rtest/linux.x86/grdradial_angle_dot.png
> create mode 100644 rtest/linux.x86/grdradial_angle_dot.svg
> create mode 100644 rtest/linux.x86/grdradial_dot.png
> create mode 100644 rtest/linux.x86/grdradial_dot.svg
> create mode 100644 rtest/linux.x86/grdradial_node_dot.png
> create mode 100644 rtest/linux.x86/grdradial_node_dot.svg
> create mode 100644 rtest/linux.x86/grdshapes_dot.png
> create mode 100644 rtest/linux.x86/grdshapes_dot.svg
> create mode 100644 rtest/linux.x86/html2_dot.gv
> create mode 100644 rtest/linux.x86/html2_dot.ps
> create mode 100644 rtest/linux.x86/html2_dot.svg
> create mode 100644 rtest/linux.x86/html_dot.gv
> create mode 100644 rtest/linux.x86/html_dot.ps
> create mode 100644 rtest/linux.x86/inv_inv_dot.png
> create mode 100644 rtest/linux.x86/inv_nul_dot.png
> create mode 100644 rtest/linux.x86/inv_val_dot.png
> create mode 100644 rtest/linux.x86/japanese_dot.png
> create mode 100644 rtest/linux.x86/layers_dot.ps
> create mode 100644 rtest/linux.x86/mode_neato.ps
> create mode 100644 rtest/linux.x86/mode_neato1.ps
> create mode 100644 rtest/linux.x86/mode_neato2.ps
> create mode 100644 rtest/linux.x86/model_neato.ps
> create mode 100644 rtest/linux.x86/model_neato1.ps
> create mode 100644 rtest/linux.x86/neatosplines_neato.gv
> create mode 100644 rtest/linux.x86/neatosplines_neato1.gv
> create mode 100644 rtest/linux.x86/nestedclust_dot.gv
> create mode 100644 rtest/linux.x86/nojustify_dot.png
> create mode 100644 rtest/linux.x86/nojustify_dot.ps
> create mode 100644 rtest/linux.x86/nojustify_dot_cairo.ps
> create mode 100644 rtest/linux.x86/nojustify_dot_gd.png
> create mode 100644 rtest/linux.x86/nul_inv_dot.png
> create mode 100644 rtest/linux.x86/nul_nul_dot.png
> create mode 100644 rtest/linux.x86/nul_val_dot.png
> create mode 100644 rtest/linux.x86/ordering_dot.gv
> create mode 100644 rtest/linux.x86/ordering_dot1.gv
> create mode 100644 rtest/linux.x86/overlap_neato.gv
> create mode 100644 rtest/linux.x86/overlap_neato1.gv
> create mode 100644 rtest/linux.x86/pack_neato.gv
> create mode 100644 rtest/linux.x86/pack_neato1.gv
> create mode 100644 rtest/linux.x86/pack_neato2.gv
> create mode 100644 rtest/linux.x86/page_neato.ps
> create mode 100644 rtest/linux.x86/page_neato1.ps
> create mode 100644 rtest/linux.x86/page_neato2.ps
> create mode 100644 rtest/linux.x86/polypoly_dot.png
> create mode 100644 rtest/linux.x86/polypoly_dot.ps
> create mode 100644 rtest/linux.x86/ports_dot.gv
> create mode 100644 rtest/linux.x86/ps_user_shapes_dot.ps
> create mode 100644 rtest/linux.x86/pslib_dot.ps
> create mode 100644 rtest/linux.x86/rankdir_dot.gv
> create mode 100644 rtest/linux.x86/rankdir_dot1.gv
> create mode 100644 rtest/linux.x86/rankdir_dot2.gv
> create mode 100644 rtest/linux.x86/rd_rules_dot.png
> create mode 100644 rtest/linux.x86/record_dot.gv
> create mode 100644 rtest/linux.x86/record_dot.ps
> create mode 100644 rtest/linux.x86/root_circo.gv
> create mode 100644 rtest/linux.x86/root_twopi.gv
> create mode 100644 rtest/linux.x86/rootlabel_dot.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot1.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot2.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot3.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot4.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot5.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot6.ps
> create mode 100644 rtest/linux.x86/rootlabel_dot7.ps
> create mode 100644 rtest/linux.x86/rotate_dot.png
> create mode 100644 rtest/linux.x86/rotate_dot.ps
> create mode 100644 rtest/linux.x86/rotate_dot1.png
> create mode 100644 rtest/linux.x86/rotate_dot1.ps
> create mode 100644 rtest/linux.x86/rowcolsep_dot.gv
> create mode 100644 rtest/linux.x86/rowcolsep_dot1.gv
> create mode 100644 rtest/linux.x86/russian_dot.png
> create mode 100644 rtest/linux.x86/sb_box_dbl_dot.png
> create mode 100644 rtest/linux.x86/sb_box_dot.png
> create mode 100644 rtest/linux.x86/sb_circle_dbl_dot.png
> create mode 100644 rtest/linux.x86/sb_circle_dot.png
> create mode 100644 rtest/linux.x86/shapes_dot.gv
> create mode 100644 rtest/linux.x86/shapes_dot.ps
> create mode 100644 rtest/linux.x86/sides_dot.ps
> create mode 100644 rtest/linux.x86/size_ex_dot.png
> create mode 100644 rtest/linux.x86/size_ex_dot.ps
> create mode 100644 rtest/linux.x86/size_neato.png
> create mode 100644 rtest/linux.x86/size_neato.ps
> create mode 100644 rtest/linux.x86/sl_box_dbl_dot.png
> create mode 100644 rtest/linux.x86/sl_box_dot.png
> create mode 100644 rtest/linux.x86/sl_circle_dbl_dot.png
> create mode 100644 rtest/linux.x86/sl_circle_dot.png
> create mode 100644 rtest/linux.x86/sq_rules_dot.png
> create mode 100644 rtest/linux.x86/sr_box_dbl_dot.png
> create mode 100644 rtest/linux.x86/sr_box_dot.png
> create mode 100644 rtest/linux.x86/sr_circle_dbl_dot.png
> create mode 100644 rtest/linux.x86/sr_circle_dot.png
> create mode 100644 rtest/linux.x86/st_box_dbl_dot.png
> create mode 100644 rtest/linux.x86/st_box_dot.png
> create mode 100644 rtest/linux.x86/st_circle_dbl_dot.png
> create mode 100644 rtest/linux.x86/st_circle_dot.png
> create mode 100644 rtest/linux.x86/style_dot.png
> create mode 100644 rtest/linux.x86/style_dot.ps
> create mode 100644 rtest/linux.x86/url_dot.cmapx
> create mode 100644 rtest/linux.x86/url_dot.cmapx_np
> create mode 100644 rtest/linux.x86/url_dot.imap
> create mode 100644 rtest/linux.x86/url_dot.imap_np
> create mode 100644 rtest/linux.x86/url_dot.ps2
> create mode 100644 rtest/linux.x86/url_dot.svg
> create mode 100644 rtest/linux.x86/user_shapes_dot.ps
> create mode 100644 rtest/linux.x86/user_shapes_dot_gd.png
> create mode 100644 rtest/linux.x86/val_inv_dot.png
> create mode 100644 rtest/linux.x86/val_nul_dot.png
> create mode 100644 rtest/linux.x86/val_val_dot.png
> create mode 100644 rtest/linux.x86/viewport_neato.png
> create mode 100644 rtest/linux.x86/viewport_neato.ps
> create mode 100644 rtest/linux.x86/viewport_neato1.png
> create mode 100644 rtest/linux.x86/viewport_neato1.ps
> create mode 100644 rtest/linux.x86/viewport_neato2.png
> create mode 100644 rtest/linux.x86/viewport_neato2.ps
> create mode 100644 rtest/linux.x86/weight_dot.gv
> create mode 100644 rtest/linux.x86/xlabels_dot.png
> create mode 100644 rtest/linux.x86/xlabels_neato.png
> create mode 100644 rtest/nshare/html2_dot.svg
> delete mode 100644 rtest/sgi.mips3/dummy
> delete mode 100644 rtest/sol6.sun4/b69.ps
> delete mode 100644 rtest/sol6.sun4/ldbxtried.gv
> delete mode 100644 tclpkg/Makefile.old
> delete mode 100644 tclpkg/gdtclft/Makefile.old
> delete mode 100644 tclpkg/tcldot/Makefile.old
> delete mode 100644 tclpkg/tclhandle/Makefile.old
> delete mode 100644 tclpkg/tclstubs/Makefile.old
> create mode 100644 tests/CMakeLists.txt
> create mode 100644 tests/Makefile.am
> create mode 100644 tests/regression_tests/CMakeLists.txt
> create mode 100644 tests/regression_tests/Makefile.am
> create mode 100644 tests/regression_tests/regression_test_helpers.py
> create mode 100644 tests/regression_tests/regression_tests.bat
> create mode 100644 tests/regression_tests/shapes/CMakeLists.txt
> create mode 100644 tests/regression_tests/shapes/Makefile.am
> create mode 100644 tests/regression_tests/shapes/reference/Mcircle.gv
> create mode 100644 tests/regression_tests/shapes/reference/Mcircle.svg
> create mode 100644 tests/regression_tests/shapes/reference/Mcircle.xdot
> create mode 100644 tests/regression_tests/shapes/reference/Mdiamond.gv
> create mode 100644 tests/regression_tests/shapes/reference/Mdiamond.svg
> create mode 100644 tests/regression_tests/shapes/reference/Mdiamond.xdot
> create mode 100644 tests/regression_tests/shapes/reference/Msquare.gv
> create mode 100644 tests/regression_tests/shapes/reference/Msquare.svg
> create mode 100644 tests/regression_tests/shapes/reference/Msquare.xdot
> create mode 100644 tests/regression_tests/shapes/reference/assembly.gv
> create mode 100644 tests/regression_tests/shapes/reference/assembly.svg
> create mode 100644 tests/regression_tests/shapes/reference/assembly.xdot
> create mode 100644 tests/regression_tests/shapes/reference/box.gv
> create mode 100644 tests/regression_tests/shapes/reference/box.svg
> create mode 100644 tests/regression_tests/shapes/reference/box.xdot
> create mode 100644 tests/regression_tests/shapes/reference/box3d.gv
> create mode 100644 tests/regression_tests/shapes/reference/box3d.svg
> create mode 100644 tests/regression_tests/shapes/reference/box3d.xdot
> create mode 100644 tests/regression_tests/shapes/reference/cds.gv
> create mode 100644 tests/regression_tests/shapes/reference/cds.svg
> create mode 100644 tests/regression_tests/shapes/reference/cds.xdot
> create mode 100644 tests/regression_tests/shapes/reference/circle.gv
> create mode 100644 tests/regression_tests/shapes/reference/circle.svg
> create mode 100644 tests/regression_tests/shapes/reference/circle.xdot
> create mode 100644 tests/regression_tests/shapes/reference/component.gv
> create mode 100644 tests/regression_tests/shapes/reference/component.svg
> create mode 100644 tests/regression_tests/shapes/reference/component.xdot
> create mode 100644 tests/regression_tests/shapes/reference/cylinder.gv
> create mode 100644 tests/regression_tests/shapes/reference/cylinder.svg
> create mode 100644 tests/regression_tests/shapes/reference/cylinder.xdot
> create mode 100644 tests/regression_tests/shapes/reference/diamond.gv
> create mode 100644 tests/regression_tests/shapes/reference/diamond.svg
> create mode 100644 tests/regression_tests/shapes/reference/diamond.xdot
> create mode 100644 tests/regression_tests/shapes/reference/doublecircle.gv
> create mode 100644 tests/regression_tests/shapes/reference/doublecircle.svg
> create mode 100644 tests/regression_tests/shapes/reference/doublecircle.xdot
> create mode 100644 tests/regression_tests/shapes/reference/doubleoctagon.gv
> create mode 100644 tests/regression_tests/shapes/reference/doubleoctagon.svg
> create mode 100644 tests/regression_tests/shapes/reference/doubleoctagon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/egg.gv
> create mode 100644 tests/regression_tests/shapes/reference/egg.svg
> create mode 100644 tests/regression_tests/shapes/reference/egg.xdot
> create mode 100644 tests/regression_tests/shapes/reference/ellipse.gv
> create mode 100644 tests/regression_tests/shapes/reference/ellipse.svg
> create mode 100644 tests/regression_tests/shapes/reference/ellipse.xdot
> create mode 100644 tests/regression_tests/shapes/reference/fivepoverhang.gv
> create mode 100644 tests/regression_tests/shapes/reference/fivepoverhang.svg
> create mode 100644 tests/regression_tests/shapes/reference/fivepoverhang.xdot
> create mode 100644 tests/regression_tests/shapes/reference/folder.gv
> create mode 100644 tests/regression_tests/shapes/reference/folder.svg
> create mode 100644 tests/regression_tests/shapes/reference/folder.xdot
> create mode 100644 tests/regression_tests/shapes/reference/hexagon.gv
> create mode 100644 tests/regression_tests/shapes/reference/hexagon.svg
> create mode 100644 tests/regression_tests/shapes/reference/hexagon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/house.gv
> create mode 100644 tests/regression_tests/shapes/reference/house.svg
> create mode 100644 tests/regression_tests/shapes/reference/house.xdot
> create mode 100644 tests/regression_tests/shapes/reference/insulator.gv
> create mode 100644 tests/regression_tests/shapes/reference/insulator.svg
> create mode 100644 tests/regression_tests/shapes/reference/insulator.xdot
> create mode 100644 tests/regression_tests/shapes/reference/invhouse.gv
> create mode 100644 tests/regression_tests/shapes/reference/invhouse.svg
> create mode 100644 tests/regression_tests/shapes/reference/invhouse.xdot
> create mode 100644 tests/regression_tests/shapes/reference/invtrapezium.gv
> create mode 100644 tests/regression_tests/shapes/reference/invtrapezium.svg
> create mode 100644 tests/regression_tests/shapes/reference/invtrapezium.xdot
> create mode 100644 tests/regression_tests/shapes/reference/invtriangle.gv
> create mode 100644 tests/regression_tests/shapes/reference/invtriangle.svg
> create mode 100644 tests/regression_tests/shapes/reference/invtriangle.xdot
> create mode 100644 tests/regression_tests/shapes/reference/larrow.gv
> create mode 100644 tests/regression_tests/shapes/reference/larrow.svg
> create mode 100644 tests/regression_tests/shapes/reference/larrow.xdot
> create mode 100644 tests/regression_tests/shapes/reference/lpromoter.gv
> create mode 100644 tests/regression_tests/shapes/reference/lpromoter.svg
> create mode 100644 tests/regression_tests/shapes/reference/lpromoter.xdot
> create mode 100644 tests/regression_tests/shapes/reference/none.gv
> create mode 100644 tests/regression_tests/shapes/reference/none.svg
> create mode 100644 tests/regression_tests/shapes/reference/none.xdot
> create mode 100644 tests/regression_tests/shapes/reference/note.gv
> create mode 100644 tests/regression_tests/shapes/reference/note.svg
> create mode 100644 tests/regression_tests/shapes/reference/note.xdot
> create mode 100644 tests/regression_tests/shapes/reference/noverhang.gv
> create mode 100644 tests/regression_tests/shapes/reference/noverhang.svg
> create mode 100644 tests/regression_tests/shapes/reference/noverhang.xdot
> create mode 100644 tests/regression_tests/shapes/reference/octagon.gv
> create mode 100644 tests/regression_tests/shapes/reference/octagon.svg
> create mode 100644 tests/regression_tests/shapes/reference/octagon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/oval.gv
> create mode 100644 tests/regression_tests/shapes/reference/oval.svg
> create mode 100644 tests/regression_tests/shapes/reference/oval.xdot
> create mode 100644 tests/regression_tests/shapes/reference/parallelogram.gv
> create mode 100644 tests/regression_tests/shapes/reference/parallelogram.svg
> create mode 100644 tests/regression_tests/shapes/reference/parallelogram.xdot
> create mode 100644 tests/regression_tests/shapes/reference/pentagon.gv
> create mode 100644 tests/regression_tests/shapes/reference/pentagon.svg
> create mode 100644 tests/regression_tests/shapes/reference/pentagon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/plain.gv
> create mode 100644 tests/regression_tests/shapes/reference/plain.svg
> create mode 100644 tests/regression_tests/shapes/reference/plain.xdot
> create mode 100644 tests/regression_tests/shapes/reference/plaintext.gv
> create mode 100644 tests/regression_tests/shapes/reference/plaintext.svg
> create mode 100644 tests/regression_tests/shapes/reference/plaintext.xdot
> create mode 100644 tests/regression_tests/shapes/reference/point.gv
> create mode 100644 tests/regression_tests/shapes/reference/point.svg
> create mode 100644 tests/regression_tests/shapes/reference/point.xdot
> create mode 100644 tests/regression_tests/shapes/reference/polygon.gv
> create mode 100644 tests/regression_tests/shapes/reference/polygon.svg
> create mode 100644 tests/regression_tests/shapes/reference/polygon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/primersite.gv
> create mode 100644 tests/regression_tests/shapes/reference/primersite.svg
> create mode 100644 tests/regression_tests/shapes/reference/primersite.xdot
> create mode 100644 tests/regression_tests/shapes/reference/promoter.gv
> create mode 100644 tests/regression_tests/shapes/reference/promoter.svg
> create mode 100644 tests/regression_tests/shapes/reference/promoter.xdot
> create mode 100644 tests/regression_tests/shapes/reference/proteasesite.gv
> create mode 100644 tests/regression_tests/shapes/reference/proteasesite.svg
> create mode 100644 tests/regression_tests/shapes/reference/proteasesite.xdot
> create mode 100644 tests/regression_tests/shapes/reference/proteinstab.gv
> create mode 100644 tests/regression_tests/shapes/reference/proteinstab.svg
> create mode 100644 tests/regression_tests/shapes/reference/proteinstab.xdot
> create mode 100644 tests/regression_tests/shapes/reference/rarrow.gv
> create mode 100644 tests/regression_tests/shapes/reference/rarrow.svg
> create mode 100644 tests/regression_tests/shapes/reference/rarrow.xdot
> create mode 100644 tests/regression_tests/shapes/reference/rect.gv
> create mode 100644 tests/regression_tests/shapes/reference/rect.svg
> create mode 100644 tests/regression_tests/shapes/reference/rect.xdot
> create mode 100644 tests/regression_tests/shapes/reference/rectangle.gv
> create mode 100644 tests/regression_tests/shapes/reference/rectangle.svg
> create mode 100644 tests/regression_tests/shapes/reference/rectangle.xdot
> create mode 100644 tests/regression_tests/shapes/reference/restrictionsite.gv
> create mode 100644 tests/regression_tests/shapes/reference/restrictionsite.svg
> create mode 100644 tests/regression_tests/shapes/reference/restrictionsite.xdot
> create mode 100644 tests/regression_tests/shapes/reference/ribosite.gv
> create mode 100644 tests/regression_tests/shapes/reference/ribosite.svg
> create mode 100644 tests/regression_tests/shapes/reference/ribosite.xdot
> create mode 100644 tests/regression_tests/shapes/reference/rnastab.gv
> create mode 100644 tests/regression_tests/shapes/reference/rnastab.svg
> create mode 100644 tests/regression_tests/shapes/reference/rnastab.xdot
> create mode 100644 tests/regression_tests/shapes/reference/rpromoter.gv
> create mode 100644 tests/regression_tests/shapes/reference/rpromoter.svg
> create mode 100644 tests/regression_tests/shapes/reference/rpromoter.xdot
> create mode 100644 tests/regression_tests/shapes/reference/septagon.gv
> create mode 100644 tests/regression_tests/shapes/reference/septagon.svg
> create mode 100644 tests/regression_tests/shapes/reference/septagon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/signature.gv
> create mode 100644 tests/regression_tests/shapes/reference/signature.svg
> create mode 100644 tests/regression_tests/shapes/reference/signature.xdot
> create mode 100644 tests/regression_tests/shapes/reference/square.gv
> create mode 100644 tests/regression_tests/shapes/reference/square.svg
> create mode 100644 tests/regression_tests/shapes/reference/square.xdot
> create mode 100644 tests/regression_tests/shapes/reference/star.gv
> create mode 100644 tests/regression_tests/shapes/reference/star.svg
> create mode 100644 tests/regression_tests/shapes/reference/star.xdot
> create mode 100644 tests/regression_tests/shapes/reference/tab.gv
> create mode 100644 tests/regression_tests/shapes/reference/tab.svg
> create mode 100644 tests/regression_tests/shapes/reference/tab.xdot
> create mode 100644 tests/regression_tests/shapes/reference/terminator.gv
> create mode 100644 tests/regression_tests/shapes/reference/terminator.svg
> create mode 100644 tests/regression_tests/shapes/reference/terminator.xdot
> create mode 100644 tests/regression_tests/shapes/reference/threepoverhang.gv
> create mode 100644 tests/regression_tests/shapes/reference/threepoverhang.svg
> create mode 100644 tests/regression_tests/shapes/reference/threepoverhang.xdot
> create mode 100644 tests/regression_tests/shapes/reference/trapezium.gv
> create mode 100644 tests/regression_tests/shapes/reference/trapezium.svg
> create mode 100644 tests/regression_tests/shapes/reference/trapezium.xdot
> create mode 100644 tests/regression_tests/shapes/reference/triangle.gv
> create mode 100644 tests/regression_tests/shapes/reference/triangle.svg
> create mode 100644 tests/regression_tests/shapes/reference/triangle.xdot
> create mode 100644 tests/regression_tests/shapes/reference/tripleoctagon.gv
> create mode 100644 tests/regression_tests/shapes/reference/tripleoctagon.svg
> create mode 100644 tests/regression_tests/shapes/reference/tripleoctagon.xdot
> create mode 100644 tests/regression_tests/shapes/reference/underline.gv
> create mode 100644 tests/regression_tests/shapes/reference/underline.svg
> create mode 100644 tests/regression_tests/shapes/reference/underline.xdot
> create mode 100644 tests/regression_tests/shapes/reference/utr.gv
> create mode 100644 tests/regression_tests/shapes/reference/utr.svg
> create mode 100644 tests/regression_tests/shapes/reference/utr.xdot
> create mode 100644 tests/regression_tests/shapes/shapes.py
> create mode 100644 tests/unit_tests/Makefile.am
> create mode 100644 tests/unit_tests/lib/Makefile.am
> create mode 100644 tests/unit_tests/lib/common/Makefile.am
> create mode 100644 tests/unit_tests/lib/common/command_line.c
> create mode 100644 windows/CMakeLists.txt
> delete mode 100644 windows/FEATURE/sfio
> delete mode 100644 windows/FEATURE/vmalloc
> delete mode 100644 windows/ast_common.h
> delete mode 100644 windows/builddate.h
> delete mode 100644 windows/config.h
> create mode 160000 windows/dependencies/graphviz-build-utilities
> create mode 160000 windows/dependencies/libraries
> delete mode 100644 windows/getopt.h
> create mode 100644 windows/getopt/CMakeLists.txt
> create mode 100644 windows/getopt/getopt.c
> create mode 100644 windows/getopt/getopt.h
> create mode 100644 windows/getopt/getopt.vcxproj
> create mode 100644 windows/getopt/getopt.vcxproj.filters
> create mode 100644 windows/include/FEATURE/sfio
> create mode 100644 windows/include/builddate.h
> create mode 100644 windows/include/config.h
> create mode 100644 windows/include/exop.h
> create mode 100644 windows/include/gdefs.h
> create mode 100644 windows/include/ps_font_equiv.h
> create mode 100644 windows/include/unistd.h
> delete mode 100644 windows/libann/dll.vcproj
>First, rewinding head to replay your work on top of it...
>Applying: Applied patch
>Using index info to reconstruct a base tree...
>A       Config.mk.old
>M       Doxyfile.in
>A       INSTALL.old
>M       Makefile.am
>A       Makefile.old
>M       appveyor.yml
>A       cmd/Makefile.old
>A       cmd/dot/Makefile.old
>A       cmd/dot/dot.vcproj
>M       cmd/dotty/Makefile.am
>A       cmd/dotty/Makefile.old
>A       cmd/dotty/dotty.vcproj
>M       cmd/dotty/mswin32/dotty.mak
>M       cmd/edgepaint/Makefile.am
>M       cmd/edgepaint/edgepaint.1
>A       cmd/edgepaint/edgepaint.vcproj
>M       cmd/edgepaint/edgepaintmain.c
>M       cmd/gvedit/Makefile.am
>M       cmd/gvedit/csettings.cpp
>M       cmd/gvedit/csettings.h
>M       cmd/gvedit/gvedit.pro.in
>M       cmd/gvedit/gvedit.pro.ms
>A       cmd/gvedit/gvedit.vcproj
>M       cmd/gvedit/main.cpp
>M       cmd/gvedit/mainwindow.cpp
>M       cmd/gvedit/ui_settings.h
>A       cmd/gvmap/gvmap.vcproj
>A       cmd/gvmap/gvmap.vcproj.RESEARCH.arif.user
>A       cmd/gvpr/Makefile.old
>A       cmd/gvpr/gvpr.vcproj
>M       cmd/lefty/Makefile.am
>A       cmd/lefty/Makefile.old
>M       cmd/lefty/aix_mods/common.h
>M       cmd/lefty/common.h
>M       cmd/lefty/dot2l/dotparse.y
>M       cmd/lefty/g.c
>M       cmd/lefty/g.h
>M       cmd/lefty/gfxview.c
>M       cmd/lefty/internal.c
>M       cmd/lefty/lefty.c
>A       cmd/lefty/lefty.vcproj
>M       cmd/lefty/os/mswin32/lefty.mak
>M       cmd/lefty/tbl.c
>M       cmd/lefty/tbl.h
>M       cmd/lefty/txtview.c
>M       cmd/lefty/ws/x11/gquery.c
>M       cmd/lefty/ws/x11/libfilereq/Dir.c
>M       cmd/lefty/ws/x11/libfilereq/Draw.c
>M       cmd/lefty/ws/x11/libfilereq/Path.c
>M       cmd/lefty/ws/x11/libfilereq/SelFile.c
>M       cmd/lneato/Makefile.am
>A       cmd/lneato/Makefile.old
>A       cmd/lneato/lneato.vcproj
>M       cmd/lneato/mswin32/lneato.mak
>M       cmd/mingle/Makefile.am
>A       cmd/mingle/mingle.vcproj
>M       cmd/mingle/minglemain.c
>M       cmd/smyrna/Makefile.am
>M       cmd/smyrna/btree.c
>M       cmd/smyrna/btree.h
>M       cmd/smyrna/draw.c
>M       cmd/smyrna/draw.h
>M       cmd/smyrna/gltemplate.c
>M       cmd/smyrna/gltemplate.h
>M       cmd/smyrna/gui/callbacks.c
>M       cmd/smyrna/gui/callbacks.h
>M       cmd/smyrna/gui/datalistcallbacks.c
>M       cmd/smyrna/gui/datalistcallbacks.h
>M       cmd/smyrna/gui/frmobjectui.c
>M       cmd/smyrna/gui/glcompui.c
>M       cmd/smyrna/gui/gui.c
>M       cmd/smyrna/gui/menucallbacks.c
>M       cmd/smyrna/gui/menucallbacks.h
>M       cmd/smyrna/gui/toolboxcallbacks.c
>M       cmd/smyrna/gui/toolboxcallbacks.h
>M       cmd/smyrna/main.c
>M       cmd/smyrna/materials.h
>M       cmd/smyrna/polytess.c
>A       cmd/smyrna/smyrna.vcproj
>A       cmd/smyrna/smyrna.vcproj.RESEARCH.arif.user
>M       cmd/smyrna/smyrnadefs.h
>M       cmd/smyrna/support.c
>M       cmd/smyrna/support.h
>M       cmd/smyrna/topfisheyeview.c
>M       cmd/smyrna/trackball.c
>M       cmd/smyrna/trackball.h
>M       cmd/smyrna/tvnodes.c
>M       cmd/smyrna/tvnodes.h
>M       cmd/smyrna/viewport.c
>M       cmd/smyrna/viewport.h
>M       cmd/tools/Makefile.am
>A       cmd/tools/Makefile.old
>M       cmd/tools/acyclic.c
>A       cmd/tools/acyclic.vcproj
>M       cmd/tools/bcomps.c
>A       cmd/tools/bcomps.vcproj
>M       cmd/tools/ccomps.c
>A       cmd/tools/ccomps.vcproj
>M       cmd/tools/convert.h
>M       cmd/tools/cvtgxl.c
>M       cmd/tools/dijkstra.c
>A       cmd/tools/dijkstra.vcproj
>M       cmd/tools/gc.c
>A       cmd/tools/gc.vcproj
>M       cmd/tools/gml2gv.c
>M       cmd/tools/gml2gv.h
>A       cmd/tools/gml2gv.vcproj
>A       cmd/tools/gml2gv.vcproj.RESEARCH.arif.user
>A       cmd/tools/gml2gv.vcproj.user
>M       cmd/tools/gmlparse.y
>M       cmd/tools/gmlscan.l
>M       cmd/tools/graph_generator.c
>M       cmd/tools/graphml2gv.c
>A       cmd/tools/graphml2gv.vcproj
>M       cmd/tools/gv2gml.c
>A       cmd/tools/gv2gml.vcproj
>A       cmd/tools/gv2gxl.vcproj
>M       cmd/tools/gvcolor.c
>A       cmd/tools/gvcolor.vcproj
>M       cmd/tools/gvgen.1
>M       cmd/tools/gvgen.c
>A       cmd/tools/gvgen.vcproj
>M       cmd/tools/gvpack.c
>A       cmd/tools/gvpack.vcproj
>M       cmd/tools/gvpack_builtins.c
>M       cmd/tools/gxl2gv.c
>A       cmd/tools/gxl2gv.vcproj
>M       cmd/tools/mm2gv.c
>A       cmd/tools/mm2gv.vcproj
>M       cmd/tools/nop.c
>A       cmd/tools/nop.vcproj
>M       cmd/tools/sccmap.c
>A       cmd/tools/sccmap.vcproj
>M       cmd/tools/tred.1
>M       cmd/tools/tred.c
>A       cmd/tools/tred.vcproj
>M       cmd/tools/unflatten.c
>A       cmd/tools/unflatten.vcproj
>A       config.h.old
>M       config/config_python.py
>M       configure.ac
>A       configure.old
>M       contrib/Makefile.am
>A       contrib/Makefile.old
>M       contrib/diffimg/Makefile.am
>M       contrib/diffimg/diffimg.c
>A       contrib/diffimg/diffimg.vcproj
>A       contrib/dirgraph/Makefile.old
>M       contrib/dirgraph/apache.dot
>M       contrib/dirgraph/bsdarch.dot
>M       contrib/dirgraph/bsdkernel.dot
>M       contrib/dirgraph/dirgraph.pl
>M       contrib/dirgraph/named.dot
>A       contrib/lefty-grace/Makefile.old
>M       contrib/lefty-grace/README
>M       contrib/prune/Makefile.am
>A       contrib/prune/Makefile.old
>M       contrib/prune/generic_list.c
>M       contrib/prune/generic_list.h
>M       contrib/prune/prune.c
>A       contrib/prune/prune.vcproj
>M       doc/Dot.ref
>M       doc/FAQ.html
>M       doc/build.html
>M       doc/docbook/src/graphviz_plugins.xml
>M       doc/dotguide/graphdraw.bib
>M       doc/dottyguide.pdf
>M       doc/fontfaq.txt
>M       doc/info/attrs.html
>M       doc/info/output.html
>M       doc/info/shapes.html
>A       doc/infosrc/Makefile.old
>M       doc/infosrc/attrs
>M       doc/infosrc/html.2
>M       doc/infosrc/html_grammar
>M       doc/infosrc/mkoutput.sh
>M       doc/infosrc/output.1
>M       doc/infosrc/outputs
>M       doc/infosrc/shapes.2
>M       doc/infosrc/shapes.3
>M       doc/infosrc/types
>M       doc/lefty/section3.tex
>M       doc/leftyguide.pdf
>M       doc/libgraph/sccmap.c
>M       doc/smyrna/using.tex
>M       doc/winbuild.html
>M       dot.demo/demo.vcproj
>M       graphviz.sln
>A       graphviz.vcproj
>A       lib/Makefile.old
>A       lib/agraph/Makefile.old
>A       lib/agutil/Makefile.old
>A       lib/ast/Makefile.old
>A       lib/ast/ast.vcproj
>A       lib/cdt/Makefile.old
>A       lib/cdt/cdt.def
>A       lib/cdt/cdt.vcproj
>A       lib/cgraph/Makefile.old
>A       lib/cgraph/cgraph.def
>A       lib/cgraph/cgraph.vcproj
>A       lib/circogen/Makefile.old
>A       lib/circogen/gvcircogen.vcproj
>A       lib/common/Makefile.old
>A       lib/dotgen/Makefile.old
>A       lib/dotgen/gvdotgen.vcproj
>A       lib/edgepaint/edgepaintlib.vcproj
>A       lib/edgepaint/lab_gamut.vcproj
>A       lib/expr/Makefile.old
>A       lib/expr/expr.vcproj
>A       lib/fdpgen/Makefile.old
>A       lib/fdpgen/gvfdpgen.vcproj
>A       lib/gd/Makefile.old
>A       lib/gd/gd.vcproj
>A       lib/glcomp/glcomp.vcproj
>A       lib/graph/Makefile.old
>M       lib/graph/graph.vcproj
>M       lib/gvc.def
>A       lib/gvc.vcproj
>A       lib/gvc.vcproj.RESEARCH.arif.user
>A       lib/gvc/Makefile.old
>A       lib/gvc/gvc.vcproj
>A       lib/gvpr/Makefile.old
>A       lib/gvpr/gvprlib.vcproj
>A       lib/ingraphs/Makefile.old
>A       lib/ingraphs/ingraphs.vcproj
>A       lib/inkpot/Makefile.old
>A       lib/mingle/minglelib.vcproj
>A       lib/neatogen/Makefile.old
>A       lib/neatogen/gvneatogen.vcproj
>A       lib/ortho/Makefile.old
>A       lib/ortho/gvortho.vcproj
>A       lib/osage/Makefile.old
>A       lib/osage/osage.vcproj
>A       lib/pack/Makefile.old
>A       lib/patchwork/Makefile.old
>A       lib/patchwork/gvpatchwork.vcproj
>A       lib/pathplan/Makefile.old
>A       lib/pathplan/Pathplan.vcproj
>A       lib/rbtree/Makefile.old
>A       lib/rbtree/rbtree.vcproj
>A       lib/sfdpgen/Makefile.old
>A       lib/sfdpgen/sfdp.vcproj
>A       lib/sfio/Makefile.old
>A       lib/sfio/Sfio_dc/Makefile.old
>A       lib/sfio/Sfio_f/Makefile.old
>A       lib/sfio/sfio.vcproj
>A       lib/sparse/Makefile.old
>A       lib/sparse/gvsparse.vcproj
>A       lib/topfish/topfish.vcproj
>A       lib/twopigen/Makefile.old
>A       lib/twopigen/gvtwopigen.vcproj
>A       lib/vmalloc/Makefile.old
>A       lib/vmalloc/vmalloc.vcproj
>A       lib/vpsc/Makefile.old
>A       lib/vpsc/vpsc.vcproj
>A       lib/xdot/Makefile.old
>A       lib/xdot/xdot.vcproj
>M       macosx/GVWindowController.h
>M       macosx/GVWindowController.m
>M       plugin.demo/xgtk/src/callbacks.c
>M       plugin.demo/xgtk/src/gvdevice_xgtk.c
>M       plugin.demo/xgtk/src/interface.c
>M       plugin.demo/xgtk/src/support.c
>M       plugin.demo/xgtk/src/support.h
>A       plugin/Makefile.old
>A       plugin/core/Makefile.old
>A       plugin/core/gvplugin_core.def
>A       plugin/core/gvplugin_core.vcproj
>A       plugin/core/plugincore.vcproj
>A       plugin/devil/Makefile.old
>M       plugin/devil/gvdevice_devil.c
>A       plugin/dot_layout/Makefile.old
>A       plugin/dot_layout/gvplugin_dot_layout.def
>A       plugin/dot_layout/gvplugin_dot_layout.vcproj
>M       plugin/gd/Makefile.am
>A       plugin/gd/Makefile.old
>M       plugin/gd/gvdevice_gd.c
>M       plugin/gd/gvloadimage_gd.c
>M       plugin/gd/gvplugin_gd.c
>A       plugin/gd/gvplugin_gd.def
>A       plugin/gd/gvplugin_gd.vcproj
>M       plugin/gd/gvrender_gd.c
>M       plugin/gd/gvrender_gd_vrml.c
>M       plugin/gd/gvtextlayout_gd.c
>M       plugin/gdiplus/GdiPlusEnums.h.patch
>M       plugin/gdiplus/GdiPlusHeaders.h.patch
>M       plugin/gdiplus/GdiPlusImaging.h.patch
>M       plugin/gdiplus/GdiPlusimageAttributes.h.patch
>M       plugin/gdiplus/Makefile.am
>M       plugin/gdiplus/gvdevice_gdiplus.cpp
>M       plugin/gdiplus/gvloadimage_gdiplus.cpp
>M       plugin/gdiplus/gvplugin_gdiplus.cpp
>A       plugin/gdiplus/gvplugin_gdiplus.def
>A       plugin/gdiplus/gvplugin_gdiplus.vcproj
>M       plugin/gdiplus/gvrender_gdiplus.cpp
>M       plugin/gdiplus/gvtextlayout_gdiplus.cpp
>A       plugin/gdk/Makefile.old
>M       plugin/gdk/gvdevice_gdk.c
>M       plugin/gdk/gvloadimage_gdk.c
>M       plugin/glitz/gvdevice_glitz.c
>A       plugin/gs/Makefile.old
>M       plugin/gs/gvloadimage_gs.c
>M       plugin/gtk/callbacks.c
>M       plugin/gtk/gvdevice_gtk.c
>M       plugin/gtk/interface.c
>M       plugin/gtk/support.c
>M       plugin/gtk/support.h
>A       plugin/lasi/Makefile.old
>M       plugin/lasi/gvloadimage_lasi.c
>M       plugin/lasi/gvrender_lasi.cpp
>A       plugin/ming/Makefile.old
>M       plugin/ming/gvrender_ming.c
>A       plugin/neato_layout/Makefile.old
>A       plugin/neato_layout/gvplugin_neato_layout.def
>A       plugin/neato_layout/gvplugin_neato_layout.vcproj
>M       plugin/pango/Makefile.am
>A       plugin/pango/Makefile.old
>M       plugin/pango/gvgetfontlist.h
>M       plugin/pango/gvgetfontlist_pango.c
>M       plugin/pango/gvloadimage_pango.c
>M       plugin/pango/gvplugin_pango.c
>A       plugin/pango/gvplugin_pango.vcproj
>M       plugin/pango/gvrender_pango.c
>M       plugin/pango/gvtextlayout_pango.c
>M       plugin/poppler/gvloadimage_poppler.c
>M       plugin/quartz/GVTextLayout.m
>M       plugin/quartz/gvdevice_quartz.c
>M       plugin/quartz/gvloadimage_quartz.c
>M       plugin/quartz/gvplugin_quartz.c
>M       plugin/quartz/gvrender_quartz.c
>M       plugin/quartz/gvtextlayout_quartz.c
>M       plugin/rsvg/Makefile.am
>A       plugin/rsvg/Makefile.old
>M       plugin/rsvg/gvloadimage_rsvg.c
>M       plugin/visio/VisioGraphic.cpp
>M       plugin/visio/VisioRender.cpp
>M       plugin/visio/VisioText.cpp
>M       plugin/visio/gvplugin_visio.c
>M       plugin/visio/gvplugin_visio.sln
>A       plugin/visio/gvplugin_visio.vcproj
>M       plugin/visio/gvplugin_visio.vcproj.RESEARCH.arif.user
>M       plugin/visio/gvrender_visio_vdx.cpp
>M       plugin/webp/gvdevice_webp.c
>M       plugin/webp/gvloadimage_webp.c
>M       plugin/xlib/gvdevice_xlib.c
>M       plugin/xlib/vimdot.sh
>A       rtest/FreeBSD.i386/dummy
>A       rtest/IRIX64.IP35.sgi_cc/dummy
>A       rtest/Linux.ia64.icc8.0/ER.ps
>A       rtest/Linux.ia64.icc8.0/Heawood.gv
>A       rtest/Linux.ia64.icc8.0/Heawood.ps
>A       rtest/Linux.ia64.icc8.0/NaN.gv
>A       rtest/Linux.ia64.icc8.0/alf.gv
>A       rtest/Linux.ia64.icc8.0/b106.gv
>A       rtest/Linux.ia64.icc8.0/b117.ps
>A       rtest/Linux.ia64.icc8.0/b117a.ps
>A       rtest/Linux.ia64.icc8.0/b124.gv
>A       rtest/Linux.ia64.icc8.0/b145.png
>A       rtest/Linux.ia64.icc8.0/b15.png
>A       rtest/Linux.ia64.icc8.0/b29.gv
>A       rtest/Linux.ia64.icc8.0/b33.ps
>A       rtest/Linux.ia64.icc8.0/b34.gif
>A       rtest/Linux.ia64.icc8.0/b36.gv
>A       rtest/Linux.ia64.icc8.0/b51.gv
>A       rtest/Linux.ia64.icc8.0/b56.gif
>A       rtest/Linux.ia64.icc8.0/b57.ps
>A       rtest/Linux.ia64.icc8.0/b60.gif
>A       rtest/Linux.ia64.icc8.0/b68.ps
>A       rtest/Linux.ia64.icc8.0/b69.ps
>A       rtest/Linux.ia64.icc8.0/b71.ps
>A       rtest/Linux.ia64.icc8.0/b81.svg
>A       rtest/Linux.ia64.icc8.0/big.ps
>A       rtest/Linux.ia64.icc8.0/biglabel.ps
>A       rtest/Linux.ia64.icc8.0/clust4.gv
>A       rtest/Linux.ia64.icc8.0/crazy.gv
>A       rtest/Linux.ia64.icc8.0/crazy.ps
>A       rtest/Linux.ia64.icc8.0/dpd.ps
>A       rtest/Linux.ia64.icc8.0/dpd1.ps
>A       rtest/Linux.ia64.icc8.0/dpd2.ps
>A       rtest/Linux.ia64.icc8.0/dpd3.ps
>A       rtest/Linux.ia64.icc8.0/dpd4.ps
>A       rtest/Linux.ia64.icc8.0/dpd5.ps
>A       rtest/Linux.ia64.icc8.0/jsort.gv
>A       rtest/Linux.ia64.icc8.0/lsunix1.ps
>A       rtest/Linux.ia64.icc8.0/lsunix2.ps
>A       rtest/Linux.ia64.icc8.0/lsunix3.ps
>A       rtest/Linux.ia64.icc8.0/newarrows.gif
>A       rtest/Linux.ia64.icc8.0/newarrows.ps
>A       rtest/Linux.ia64.icc8.0/p.ps
>A       rtest/Linux.ia64.icc8.0/p2.ps
>A       rtest/Linux.ia64.icc8.0/p3.ps
>A       rtest/Linux.ia64.icc8.0/p4.ps
>A       rtest/Linux.ia64.icc8.0/pgram.gv
>A       rtest/Linux.ia64.icc8.0/proc3d.gv
>A       rtest/Linux.ia64.icc8.0/process.ps
>A       rtest/Linux.ia64.icc8.0/record2.gv
>A       rtest/Linux.ia64.icc8.0/structs.gv
>A       rtest/Linux.ia64.icc8.0/structs.ps
>A       rtest/Linux.ia64.icc8.0/trapeziumlr.gv
>A       rtest/Linux.ia64.icc8.0/unix.gv
>A       rtest/Linux.ia64.icc8.0/unix.ps
>A       rtest/Linux.ia64.icc8.0/unix2.gv
>A       rtest/Linux.ia64.icc8.0/unix2k.gv
>M       rtest/graphs/b545.gv
>M       rtest/graphs/b993.gv
>M       rtest/graphs/cairo.gv
>M       rtest/graphs/html2.gv
>M       rtest/graphs/inv_val.gv
>M       rtest/graphs/nul_val.gv
>M       rtest/graphs/val_inv.gv
>M       rtest/graphs/val_nul.gv
>M       rtest/graphs/val_val.gv
>M       rtest/imagepath_test/imagepath_test.sh
>M       rtest/rtest.sh
>A       rtest/sgi.mips3/dummy
>A       rtest/sol6.sun4/b69.ps
>A       rtest/sol6.sun4/ldbxtried.gv
>M       rtest/tests.txt
>M       rtest/windows/ER.gv
>M       rtest/windows/ER.ps
>M       rtest/windows/Heawood.gv
>M       rtest/windows/Heawood.ps
>M       rtest/windows/KW91.gv
>M       rtest/windows/Latin1.gv
>M       rtest/windows/NaN.gv
>M       rtest/windows/Petersen.gv
>M       rtest/windows/abstract.gv
>M       rtest/windows/alf.gv
>M       rtest/windows/b102.gv
>M       rtest/windows/b106.gv
>M       rtest/windows/b117.ps
>M       rtest/windows/b117a.ps
>M       rtest/windows/b124.gv
>M       rtest/windows/b135.ps
>M       rtest/windows/b155.ps
>M       rtest/windows/b22.ps
>M       rtest/windows/b29.gv
>M       rtest/windows/b3.ps
>M       rtest/windows/b33.ps
>M       rtest/windows/b36.gv
>M       rtest/windows/b491.gv
>M       rtest/windows/b51.gv
>M       rtest/windows/b57.ps
>M       rtest/windows/b62.plain
>M       rtest/windows/b68.ps
>M       rtest/windows/b69.ps
>M       rtest/windows/b7.ps
>M       rtest/windows/b71.ps
>M       rtest/windows/b81.svg
>M       rtest/windows/b94.gv
>M       rtest/windows/big.ps
>M       rtest/windows/biglabel.ps
>M       rtest/windows/clust.gv
>M       rtest/windows/clust1.gv
>M       rtest/windows/clust2.gv
>M       rtest/windows/clust3.gv
>M       rtest/windows/clust4.gv
>M       rtest/windows/clust5.gv
>M       rtest/windows/crazy.gv
>M       rtest/windows/crazy.ps
>M       rtest/windows/ctext.gv
>M       rtest/windows/dfa.gv
>M       rtest/windows/dpd.ps
>M       rtest/windows/dpd1.ps
>M       rtest/windows/dpd2.ps
>M       rtest/windows/dpd3.ps
>M       rtest/windows/dpd4.ps
>M       rtest/windows/dpd5.ps
>M       rtest/windows/fig6.gv
>M       rtest/windows/fsm.gv
>M       rtest/windows/grammar.gv
>M       rtest/windows/hashtable.gv
>M       rtest/windows/jcctree.gv
>M       rtest/windows/jsort.gv
>M       rtest/windows/labelclust-fbc.gv
>M       rtest/windows/labelclust-fbd.gv
>M       rtest/windows/labelclust-fbl.gv
>M       rtest/windows/labelclust-fbr.gv
>M       rtest/windows/labelclust-fdc.gv
>M       rtest/windows/labelclust-fdd.gv
>M       rtest/windows/labelclust-fdl.gv
>M       rtest/windows/labelclust-fdr.gv
>M       rtest/windows/labelclust-ftc.gv
>M       rtest/windows/labelclust-ftd.gv
>M       rtest/windows/labelclust-ftl.gv
>M       rtest/windows/labelclust-ftr.gv
>M       rtest/windows/labelclust-nbc.gv
>M       rtest/windows/labelclust-nbd.gv
>M       rtest/windows/labelclust-nbl.gv
>M       rtest/windows/labelclust-nbr.gv
>M       rtest/windows/labelclust-ndc.gv
>M       rtest/windows/labelclust-ndd.gv
>M       rtest/windows/labelclust-ndl.gv
>M       rtest/windows/labelclust-ndr.gv
>M       rtest/windows/labelclust-ntc.gv
>M       rtest/windows/labelclust-ntd.gv
>M       rtest/windows/labelclust-ntl.gv
>M       rtest/windows/labelclust-ntr.gv
>M       rtest/windows/labelroot-fbc.gv
>M       rtest/windows/labelroot-fbd.gv
>M       rtest/windows/labelroot-fbl.gv
>M       rtest/windows/labelroot-fbr.gv
>M       rtest/windows/labelroot-fdc.gv
>M       rtest/windows/labelroot-fdd.gv
>M       rtest/windows/labelroot-fdl.gv
>M       rtest/windows/labelroot-fdr.gv
>M       rtest/windows/labelroot-ftc.gv
>M       rtest/windows/labelroot-ftd.gv
>M       rtest/windows/labelroot-ftl.gv
>M       rtest/windows/labelroot-ftr.gv
>M       rtest/windows/labelroot-nbc.gv
>M       rtest/windows/labelroot-nbd.gv
>M       rtest/windows/labelroot-nbl.gv
>M       rtest/windows/labelroot-nbr.gv
>M       rtest/windows/labelroot-ndc.gv
>M       rtest/windows/labelroot-ndd.gv
>M       rtest/windows/labelroot-ndl.gv
>M       rtest/windows/labelroot-ndr.gv
>M       rtest/windows/labelroot-ntc.gv
>M       rtest/windows/labelroot-ntd.gv
>M       rtest/windows/labelroot-ntl.gv
>M       rtest/windows/labelroot-ntr.gv
>M       rtest/windows/layer.ps
>M       rtest/windows/layer2.ps
>M       rtest/windows/ldbxtried.gv
>M       rtest/windows/longflat.gv
>M       rtest/windows/lsunix1.ps
>M       rtest/windows/lsunix2.ps
>M       rtest/windows/lsunix3.ps
>M       rtest/windows/mike.gv
>M       rtest/windows/newarrows.gv
>M       rtest/windows/newarrows.ps
>M       rtest/windows/ngk10_4.gv
>M       rtest/windows/ngk10_4.ps
>M       rtest/windows/nhg.gv
>M       rtest/windows/p.ps
>M       rtest/windows/p2.ps
>M       rtest/windows/p3.ps
>M       rtest/windows/p4.ps
>M       rtest/windows/pgram.gv
>M       rtest/windows/pm2way.gv
>M       rtest/windows/pmpipe.gv
>M       rtest/windows/polypoly.gv
>M       rtest/windows/proc3d.gv
>M       rtest/windows/process.gv
>M       rtest/windows/process.ps
>M       rtest/windows/record2.gv
>M       rtest/windows/records.gv
>M       rtest/windows/rowe.gv
>M       rtest/windows/shells.gv
>M       rtest/windows/states.gv
>M       rtest/windows/structs.gv
>M       rtest/windows/structs.ps
>M       rtest/windows/train11.gv
>M       rtest/windows/trapeziumlr.gv
>M       rtest/windows/tree.gv
>M       rtest/windows/triedds.gv
>M       rtest/windows/try.gv
>M       rtest/windows/unix.gv
>M       rtest/windows/unix.ps
>M       rtest/windows/unix2.gv
>M       rtest/windows/unix2k.gv
>M       rtest/windows/viewfile.gv
>M       rtest/windows/world.gv
>M       rtest2/rtests.PLAN
>M       share/examples/world.gv
>M       share/gui/attr_widgets.dot
>M       share/gui/mouse_actions.txt
>M       tclpkg/Makefile.am
>A       tclpkg/Makefile.old
>M       tclpkg/gdtclft/Makefile.am
>A       tclpkg/gdtclft/Makefile.old
>M       tclpkg/gdtclft/gdtclft.3tcl
>M       tclpkg/gdtclft/gdtclft.c
>M       tclpkg/gv/Makefile.am
>M       tclpkg/gv/demo/Makefile.am
>M       tclpkg/gv/demo/modgraph.lua
>M       tclpkg/gv/gv.cpp
>M       tclpkg/gv/gv.i
>M       tclpkg/gv/gv_doc_langs.tcl
>M       tclpkg/gv/gv_doc_template.tcl
>M       tclpkg/gv/test.lua
>M       tclpkg/tcldot/Makefile.am
>A       tclpkg/tcldot/Makefile.old
>M       tclpkg/tcldot/README
>M       tclpkg/tcldot/tcldot-id.c
>M       tclpkg/tcldot/tcldot.3tcl
>M       tclpkg/tcldot/tcldot.h
>M       tclpkg/tcldot/tcldot_builtins.c
>A       tclpkg/tclhandle/Makefile.old
>M       tclpkg/tclhandle/tclhandle.c
>M       tclpkg/tclhandle/tclhandle.h
>M       tclpkg/tclpathplan/tclpathplan.c
>A       tclpkg/tclstubs/Makefile.old
>M       tclpkg/tclstubs/README
>M       tclpkg/tkspline/tkspline.c
>M       tclpkg/tkstubs/README
>A       windows/FEATURE/sfio
>A       windows/FEATURE/vmalloc
>A       windows/ast_common.h
>M       windows/bin/build.sh
>M       windows/bin/gsetup.sh
>M       windows/build.bat
>M       windows/build_stable.bat
>A       windows/builddate.h
>M       windows/cmd/gvui/GVUI.vbp
>M       windows/cmd/gvui/GVUI.vbw
>M       windows/cmd/gvui/frmLayoutControl.frm
>M       windows/cmd/lefty/dot2l/dotparse.c
>A       windows/config.h
>A       windows/getopt.h
>M       windows/graphviz-msi/setup/setup.sln
>M       windows/graphviz-msi/setup/setup.vdproj
>M       windows/graphviz-msi/setup/setup_stable.sln
>M       windows/graphviz-msi/setup/setup_stable.vdproj
>M       windows/gvedit/USettings.cpp
>A       windows/libann/dll.vcproj
>M       windows/prebuild/iconv.patch
>M       windows/ws/graphviz.dsw
>M       windows/ws/tools.dsw
>Falling back to patching base and 3-way merge...
>CONFLICT (modify/delete): windows/ws/tools.dsw deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/ws/tools.dsw left in tree.
>CONFLICT (modify/delete): windows/ws/graphviz.dsw deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/ws/graphviz.dsw left in tree.
>Removing windows/wmake.sh
>Removing windows/prebuild/zlib.patch
>Removing windows/prebuild/pixman.patch
>Removing windows/prebuild/pango.patch
>CONFLICT (modify/delete): windows/prebuild/iconv.patch deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/prebuild/iconv.patch left in tree.
>Removing windows/prebuild/gettext.patch
>Removing windows/prebuild/gd.patch
>Removing windows/prebuild/fontconfig.patch
>Removing windows/prebuild/Makefile
>Removing windows/makefile
>Removing windows/install.bat
>CONFLICT (rename/delete): windows/include/config.h deleted in Applied patch and renamed in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/include/config.h left in tree.
>CONFLICT (rename/delete): windows/include/builddate.h deleted in Applied patch and renamed in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/include/builddate.h left in tree.
>Removing windows/gvedit/props.txt
>Removing windows/gvedit/Umain.h
>Removing windows/gvedit/Umain.dfm
>Removing windows/gvedit/Umain.cpp
>Removing windows/gvedit/USettings.h
>Removing windows/gvedit/USettings.dfm
>CONFLICT (modify/delete): windows/gvedit/USettings.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/gvedit/USettings.cpp left in tree.
>Removing windows/gvedit/UPreview.h
>Removing windows/gvedit/UPreview.dfm
>Removing windows/gvedit/UPreview.cpp
>Removing windows/gvedit/UPreProcess.h
>Removing windows/gvedit/UPreProcess.dfm
>Removing windows/gvedit/UPreProcess.cpp
>Removing windows/gvedit/UEditor.h
>Removing windows/gvedit/UEditor.dfm
>Removing windows/gvedit/UEditor.cpp
>Removing windows/gvedit/UAbout.h
>Removing windows/gvedit/UAbout.dfm
>Removing windows/gvedit/UAbout.cpp
>Removing windows/gvedit/GraphX.cpp
>Removing windows/gvedit/GraphX.bpr
>Removing windows/gvedit/Editor.ini
>Removing windows/gvedit/Application.h
>Removing windows/graphviz.sln
>Removing windows/graphviz.csproj
>CONFLICT (modify/delete): windows/graphviz-msi/setup/setup_stable.vdproj deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/graphviz-msi/setup/setup_stable.vdproj left in tree.
>CONFLICT (modify/delete): windows/graphviz-msi/setup/setup_stable.sln deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/graphviz-msi/setup/setup_stable.sln left in tree.
>CONFLICT (modify/delete): windows/graphviz-msi/setup/setup.vdproj deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/graphviz-msi/setup/setup.vdproj left in tree.
>Removing windows/graphviz-msi/setup/setup.suo
>CONFLICT (modify/delete): windows/graphviz-msi/setup/setup.sln deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/graphviz-msi/setup/setup.sln left in tree.
>Removing windows/graphviz-msi/setup/Release/setup.exe
>Removing windows/cmd/tools/makefile
>Removing windows/cmd/makefile
>Removing windows/cmd/lneato/makefile
>Removing windows/cmd/lefty/makefile
>Removing windows/cmd/lefty/dot2l/dotparse.h
>CONFLICT (modify/delete): windows/cmd/lefty/dot2l/dotparse.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/cmd/lefty/dot2l/dotparse.c left in tree.
>Removing windows/cmd/gvui/makefile
>Removing windows/cmd/gvui/frmLayoutControl.frx
>CONFLICT (modify/delete): windows/cmd/gvui/frmLayoutControl.frm deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/cmd/gvui/frmLayoutControl.frm left in tree.
>Removing windows/cmd/gvui/Registry.bas
>Removing windows/cmd/gvui/Process.bas
>Removing windows/cmd/gvui/Other.bas
>Removing windows/cmd/gvui/Main.bas
>Removing windows/cmd/gvui/LayoutPropertySet.cls
>Removing windows/cmd/gvui/LayoutPropertyInfoSet.cls
>Removing windows/cmd/gvui/LayoutPropertyInfo.cls
>Removing windows/cmd/gvui/LayoutProperty.cls
>CONFLICT (modify/delete): windows/cmd/gvui/GVUI.vbw deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/cmd/gvui/GVUI.vbw left in tree.
>CONFLICT (modify/delete): windows/cmd/gvui/GVUI.vbp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/cmd/gvui/GVUI.vbp left in tree.
>Removing windows/cmd/gvui/GVUI.exe
>Removing windows/cmd/gvpr/gdefs.h
>Removing windows/cmd/fc-fix/fc-fix.vcproj
>Removing windows/cmd/fc-fix/fc-fix.sln
>Removing windows/cmd/fc-fix/fc-fix.cpp
>Removing windows/cmd/dotty/makefile
>Removing windows/cmd/dot/makefile
>CONFLICT (modify/delete): windows/build_stable.bat deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/build_stable.bat left in tree.
>Removing windows/build/graphviz.wxs.in
>Removing windows/build/Makefile
>Removing windows/build/Graphviz.ico
>CONFLICT (modify/delete): windows/build.bat deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/build.bat left in tree.
>Removing windows/bin/win.sh
>Removing windows/bin/runconf.sh
>CONFLICT (modify/delete): windows/bin/gsetup.sh deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/bin/gsetup.sh left in tree.
>CONFLICT (modify/delete): windows/bin/build.sh deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of windows/bin/build.sh left in tree.
>Removing windows/addtopath.mst
>Removing windows/UTF8Marshaler.cs
>Removing windows/TileableImagePrinter.cs
>Removing windows/StandardValuesTypeConverter.cs
>Removing windows/ScrollableImageControl.cs
>Removing windows/ScrollableImageControl.Designer.cs
>Removing windows/Resources/ZoomOut.bmp
>Removing windows/Resources/ZoomIn.bmp
>Removing windows/Resources/NodeAttributes.png
>Removing windows/Resources/Information.bmp
>Removing windows/Resources/GraphAttributes.png
>Removing windows/Resources/EdgeAttributes.png
>Removing windows/Resources/ActualSize.bmp
>Removing windows/Properties/Settings.settings
>Removing windows/Properties/Settings.Designer.cs
>Removing windows/Properties/Resources.resx
>Removing windows/Properties/Resources.Designer.cs
>Removing windows/Properties/AssemblyInfo.cs.in
>Removing windows/Program.cs
>Removing windows/PathWatcher.cs
>Removing windows/Graphviz.res
>Removing windows/GraphPropertyDescriptor.cs
>Removing windows/GraphForm.resx
>Removing windows/GraphForm.cs
>Removing windows/GraphForm.Designer.cs
>Removing windows/GraphDefaultAttributes.cs
>Removing windows/GraphArguments.cs
>Removing windows/Graph.cs
>Removing windows/FormController.cs
>Removing windows/ExternalPropertyTab.cs
>Removing windows/AttributeInspectorForm.resx
>Removing windows/AttributeInspectorForm.cs
>Removing windows/AttributeInspectorForm.Designer.cs
>Removing tclpkg/tkstubs/tkStubLib.c
>Removing tclpkg/tkstubs/tkStubImg.c
>Removing tclpkg/tkstubs/tkInt.h
>CONFLICT (modify/delete): tclpkg/tkstubs/README deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tkstubs/README left in tree.
>Removing tclpkg/tkstubs/Makefile.am
>CONFLICT (modify/delete): tclpkg/tkspline/tkspline.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tkspline/tkspline.c left in tree.
>Removing tclpkg/tkspline/tkspline.3tk
>Removing tclpkg/tkspline/dllEntry.c
>Removing tclpkg/tkspline/demo/spline.tcl.README
>Removing tclpkg/tkspline/demo/spline.tcl
>Removing tclpkg/tkspline/demo/Makefile.am
>Removing tclpkg/tkspline/README
>Removing tclpkg/tkspline/Makefile.am
>Removing tclpkg/tkspline/CHANGES
>Removing tclpkg/tclstubs/tclStubLib.c
>Removing tclpkg/tclstubs/tclInt.h
>CONFLICT (modify/delete): tclpkg/tclstubs/README deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tclstubs/README left in tree.
>Removing tclpkg/tclstubs/Makefile.am
>Removing tclpkg/tclpathplan/wrapper.c
>CONFLICT (modify/delete): tclpkg/tclpathplan/tclpathplan.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tclpathplan/tclpathplan.c left in tree.
>Removing tclpkg/tclpathplan/simple.h
>Removing tclpkg/tclpathplan/makecw.c
>Removing tclpkg/tclpathplan/intersect.c
>Removing tclpkg/tclpathplan/find_ints.c
>Removing tclpkg/tclpathplan/demo/pathplan_data/unknown.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/u.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/rotor.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/paths.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/other.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/obs.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/northo.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/nested.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/maze.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/funny.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/dpd.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/boxes.dat
>Removing tclpkg/tclpathplan/demo/pathplan_data/Makefile.am
>Removing tclpkg/tclpathplan/demo/pathplan.tcl.README
>Removing tclpkg/tclpathplan/demo/pathplan.tcl
>Removing tclpkg/tclpathplan/demo/Makefile.am
>Removing tclpkg/tclpathplan/Makefile.am
>CONFLICT (modify/delete): tclpkg/tclhandle/tclhandle.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tclhandle/tclhandle.h left in tree.
>CONFLICT (modify/delete): tclpkg/tclhandle/tclhandle.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tclhandle/tclhandle.c left in tree.
>Removing tclpkg/tclhandle/Makefile.am
>CONFLICT (modify/delete): tclpkg/tcldot/tcldot_builtins.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tcldot/tcldot_builtins.c left in tree.
>Removing tclpkg/tcldot/tcldot.html
>CONFLICT (modify/delete): tclpkg/tcldot/tcldot.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tcldot/tcldot.h left in tree.
>Removing tclpkg/tcldot/tcldot.c
>CONFLICT (modify/delete): tclpkg/tcldot/tcldot.3tcl deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tcldot/tcldot.3tcl left in tree.
>Removing tclpkg/tcldot/tcldot-util.c
>Removing tclpkg/tcldot/tcldot-nodecmd.c
>Removing tclpkg/tcldot/tcldot-io.c
>CONFLICT (modify/delete): tclpkg/tcldot/tcldot-id.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tcldot/tcldot-id.c left in tree.
>Removing tclpkg/tcldot/tcldot-graphcmd.c
>Removing tclpkg/tcldot/tcldot-edgecmd.c
>Removing tclpkg/tcldot/no_builtins.c
>Removing tclpkg/tcldot/examples/xvdisp
>Removing tclpkg/tcldot/examples/tw
>Removing tclpkg/tcldot/examples/tst
>Removing tclpkg/tcldot/examples/structs.tcl
>Removing tclpkg/tcldot/examples/psdisp
>Removing tclpkg/tcldot/examples/neatoed
>Removing tclpkg/tcldot/examples/giffont
>Removing tclpkg/tcldot/examples/gdtest
>Removing tclpkg/tcldot/examples/disp
>Removing tclpkg/tcldot/examples/data/smbluewhite_paper.gif
>Removing tclpkg/tcldot/examples/data/poly.gv
>Removing tclpkg/tcldot/examples/data/edge.html
>Removing tclpkg/tcldot/examples/data/e.html
>Removing tclpkg/tcldot/examples/data/demo.gv
>Removing tclpkg/tcldot/examples/data/default.html
>Removing tclpkg/tcldot/examples/data/d.html
>Removing tclpkg/tcldot/examples/data/c.html
>Removing tclpkg/tcldot/examples/data/b.html
>Removing tclpkg/tcldot/examples/data/a.html
>Removing tclpkg/tcldot/examples/cyclic
>Removing tclpkg/tcldot/demo/gcat.tcl.README
>Removing tclpkg/tcldot/demo/gcat.tcl
>Removing tclpkg/tcldot/demo/doted.tcl.README
>Removing tclpkg/tcldot/demo/doted.tcl
>Removing tclpkg/tcldot/demo/Makefile.am
>Removing tclpkg/tcldot/README.Tkspline
>CONFLICT (modify/delete): tclpkg/tcldot/README deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tcldot/README left in tree.
>CONFLICT (modify/delete): tclpkg/tcldot/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/tcldot/Makefile.am left in tree.
>Removing tclpkg/mkpkgindex.sh
>Removing tclpkg/gv/test.tcl
>Removing tclpkg/gv/test.rb
>Removing tclpkg/gv/test.py
>Removing tclpkg/gv/test.pl
>Removing tclpkg/gv/test.php
>CONFLICT (modify/delete): tclpkg/gv/test.lua deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/test.lua left in tree.
>Removing tclpkg/gv/test.java
>Removing tclpkg/gv/test.guile
>Removing tclpkg/gv/test.cs
>Removing tclpkg/gv/hello.gv
>Removing tclpkg/gv/gvgotest.go
>Removing tclpkg/gv/gv_tcl_init.c
>Removing tclpkg/gv/gv_php_init.c
>Removing tclpkg/gv/gv_java_init.c
>Removing tclpkg/gv/gv_dummy_init.c
>Removing tclpkg/gv/gv_doc_writer.tcl
>CONFLICT (modify/delete): tclpkg/gv/gv_doc_template.tcl deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/gv_doc_template.tcl left in tree.
>CONFLICT (modify/delete): tclpkg/gv/gv_doc_langs.tcl deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/gv_doc_langs.tcl left in tree.
>Removing tclpkg/gv/gv_builtins.c
>CONFLICT (modify/delete): tclpkg/gv/gv.i deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/gv.i left in tree.
>CONFLICT (modify/delete): tclpkg/gv/gv.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/gv.cpp left in tree.
>Removing tclpkg/gv/examples/simple.py
>Removing tclpkg/gv/examples/layout.py
>Removing tclpkg/gv/demo/modgraph.tcl
>Removing tclpkg/gv/demo/modgraph.rb
>Removing tclpkg/gv/demo/modgraph.py
>Removing tclpkg/gv/demo/modgraph.pl
>Removing tclpkg/gv/demo/modgraph.php
>CONFLICT (modify/delete): tclpkg/gv/demo/modgraph.lua deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/demo/modgraph.lua left in tree.
>CONFLICT (modify/delete): tclpkg/gv/demo/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/demo/Makefile.am left in tree.
>CONFLICT (modify/delete): tclpkg/gv/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gv/Makefile.am left in tree.
>Removing tclpkg/gv/META.gv.in
>CONFLICT (modify/delete): tclpkg/gdtclft/gdtclft.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gdtclft/gdtclft.c left in tree.
>CONFLICT (modify/delete): tclpkg/gdtclft/gdtclft.3tcl deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gdtclft/gdtclft.3tcl left in tree.
>Removing tclpkg/gdtclft/examples/writePNGvar.tcl
>Removing tclpkg/gdtclft/examples/tst.tcl
>Removing tclpkg/gdtclft/examples/test.tcl
>Removing tclpkg/gdtclft/examples/sample.tcl
>Removing tclpkg/gdtclft/examples/kaitest.tcl
>Removing tclpkg/gdtclft/examples/getenttree.tcl
>Removing tclpkg/gdtclft/examples/gddemo.tcl
>Removing tclpkg/gdtclft/examples/demoin.png
>Removing tclpkg/gdtclft/examples/arc.tcl
>Removing tclpkg/gdtclft/examples/allchars.tcl
>Removing tclpkg/gdtclft/demo/entities.tcl.README
>Removing tclpkg/gdtclft/demo/entities.tcl
>Removing tclpkg/gdtclft/demo/entities.html
>Removing tclpkg/gdtclft/demo/entities.README
>Removing tclpkg/gdtclft/demo/Makefile.am
>CONFLICT (modify/delete): tclpkg/gdtclft/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/gdtclft/Makefile.am left in tree.
>CONFLICT (modify/delete): tclpkg/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of tclpkg/Makefile.am left in tree.
>Removing share/gui/zoomplus.raw
>Removing share/gui/zoomout.png
>Removing share/gui/zoomminus.raw
>Removing share/gui/zoomin.png
>Removing share/gui/zoom_out.png
>Removing share/gui/zoom_in.png
>Removing share/gui/zoom.raw
>Removing share/gui/zoom.png
>Removing share/gui/template.dot
>Removing share/gui/smyrna.glade
>Removing share/gui/single_select.png
>Removing share/gui/selectx.png
>Removing share/gui/selectr.png
>Removing share/gui/select.png
>Removing share/gui/rotate.raw
>Removing share/gui/rotate.png
>Removing share/gui/rect_select2.png
>Removing share/gui/rect_select.png
>Removing share/gui/preview.png
>Removing share/gui/pan.raw
>Removing share/gui/pan.png
>Removing share/gui/ok3.raw
>Removing share/gui/ok2.raw
>Removing share/gui/ok.raw
>Removing share/gui/node.png
>Removing share/gui/no_fisheye.png
>Removing share/gui/newzoom.png
>Removing share/gui/new_node.png
>Removing share/gui/new_delete.png
>Removing share/gui/move.png
>CONFLICT (modify/delete): share/gui/mouse_actions.txt deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of share/gui/mouse_actions.txt left in tree.
>Removing share/gui/mod_fisheye.png
>Removing share/gui/mod_3D.png
>Removing share/gui/magnifier_zoom_in.png
>Removing share/gui/magnifier.png
>Removing share/gui/magifier_zoom_out.png
>Removing share/gui/ltwopi.png
>Removing share/gui/lneato.png
>Removing share/gui/lfdp.png
>Removing share/gui/ldot.png
>Removing share/gui/lcirco.png
>Removing share/gui/hourglass.png
>Removing share/gui/glade-3.png
>Removing share/gui/fit_to_screen.png
>Removing share/gui/fit.png
>Removing share/gui/fisheye.raw
>Removing share/gui/fisheye.png
>Removing share/gui/fish.PNG
>Removing share/gui/find_node.png
>Removing share/gui/find_edge.png
>Removing share/gui/edge.png
>Removing share/gui/dot.PNG
>Removing share/gui/details.png
>Removing share/gui/delete_node.png
>Removing share/gui/deletE_edge.png
>Removing share/gui/cursor.png
>Removing share/gui/center.png
>Removing share/gui/attrs.txt
>CONFLICT (modify/delete): share/gui/attr_widgets.dot deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of share/gui/attr_widgets.dot left in tree.
>Removing share/gui/arial.tga
>Removing share/gui/add_edge.png
>Removing share/gui/Makefile.am
>Removing share/gui/AntiselectRectX.png
>Removing share/gui/AntiselectRect.png
>Removing share/gui/3D.png
>Removing share/gui/2D.png
>CONFLICT (modify/delete): share/examples/world.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of share/examples/world.gv left in tree.
>Removing share/examples/Makefile.am
>Removing share/examples/4elt.gv
>Removing share/Makefile.am
>Removing rtest2/test_reference.tgz
>Removing rtest2/test.tcl
>CONFLICT (modify/delete): rtest2/rtests.PLAN deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest2/rtests.PLAN left in tree.
>Removing rtest2/TESTS
>Removing rtest2/Makefile
>CONFLICT (modify/delete): rtest/windows/world.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/world.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/viewfile.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/viewfile.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/unix2k.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/unix2k.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/unix2.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/unix2.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/unix.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/unix.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/unix.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/unix.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/try.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/try.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/triedds.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/triedds.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/tree.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/tree.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/trapeziumlr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/trapeziumlr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/train11.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/train11.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/structs.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/structs.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/structs.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/structs.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/states.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/states.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/shells.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/shells.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/rowe.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/rowe.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/records.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/records.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/record2.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/record2.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/process.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/process.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/process.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/process.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/proc3d.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/proc3d.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/polypoly.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/polypoly.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/pmpipe.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/pmpipe.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/pm2way.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/pm2way.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/pgram.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/pgram.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/p4.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/p4.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/p3.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/p3.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/p2.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/p2.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/p.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/p.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/nhg.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/nhg.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/ngk10_4.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/ngk10_4.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/ngk10_4.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/ngk10_4.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/newarrows.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/newarrows.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/newarrows.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/newarrows.gv left in tree.
>Removing rtest/windows/newarrows.gif
>CONFLICT (modify/delete): rtest/windows/mike.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/mike.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/lsunix3.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/lsunix3.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/lsunix2.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/lsunix2.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/lsunix1.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/lsunix1.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/longflat.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/longflat.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/ldbxtried.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/ldbxtried.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/layer2.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/layer2.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/layer.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/layer.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ntr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ntr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ntl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ntl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ntd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ntd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ntc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ntc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ndr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ndr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ndl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ndl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ndd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ndd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ndc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ndc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-nbr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-nbr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-nbl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-nbl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-nbd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-nbd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-nbc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-nbc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ftr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ftr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ftl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ftl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ftd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ftd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-ftc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-ftc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fdr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fdr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fdl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fdl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fdd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fdd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fdc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fdc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fbr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fbr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fbl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fbl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fbd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fbd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelroot-fbc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelroot-fbc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ntr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ntr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ntl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ntl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ntd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ntd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ntc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ntc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ndr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ndr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ndl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ndl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ndd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ndd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ndc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ndc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-nbr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-nbr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-nbl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-nbl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-nbd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-nbd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-nbc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-nbc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ftr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ftr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ftl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ftl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ftd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ftd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-ftc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-ftc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fdr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fdr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fdl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fdl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fdd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fdd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fdc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fdc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fbr.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fbr.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fbl.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fbl.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fbd.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fbd.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/labelclust-fbc.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/labelclust-fbc.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/jsort.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/jsort.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/jcctree.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/jcctree.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/hashtable.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/hashtable.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/grammar.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/grammar.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/fsm.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/fsm.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/fig6.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/fig6.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/dpd5.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dpd5.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/dpd4.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dpd4.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/dpd3.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dpd3.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/dpd2.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dpd2.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/dpd1.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dpd1.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/dpd.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dpd.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/dfa.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/dfa.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/ctext.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/ctext.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/crazy.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/crazy.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/crazy.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/crazy.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/clust5.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/clust5.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/clust4.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/clust4.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/clust3.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/clust3.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/clust2.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/clust2.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/clust1.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/clust1.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/clust.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/clust.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/biglabel.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/biglabel.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/big.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/big.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b94.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b94.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/b81.svg deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b81.svg left in tree.
>Removing rtest/windows/b79.jpg
>CONFLICT (modify/delete): rtest/windows/b71.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b71.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b7.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b7.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b69.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b69.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b68.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b68.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b62.plain deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b62.plain left in tree.
>Removing rtest/windows/b60.gif
>CONFLICT (modify/delete): rtest/windows/b57.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b57.ps left in tree.
>Removing rtest/windows/b56.gif
>CONFLICT (modify/delete): rtest/windows/b51.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b51.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/b491.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b491.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/b36.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b36.gv left in tree.
>Removing rtest/windows/b34.gif
>CONFLICT (modify/delete): rtest/windows/b33.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b33.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b3.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b3.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b29.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b29.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/b22.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b22.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b155.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b155.ps left in tree.
>Removing rtest/windows/b15.png
>Removing rtest/windows/b145.png
>CONFLICT (modify/delete): rtest/windows/b135.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b135.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b124.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b124.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/b117a.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b117a.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b117.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b117.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/b106.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b106.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/b102.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/b102.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/alf.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/alf.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/abstract.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/abstract.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/Petersen.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/Petersen.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/NaN.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/NaN.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/Latin1.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/Latin1.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/KW91.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/KW91.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/Heawood.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/Heawood.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/Heawood.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/Heawood.gv left in tree.
>CONFLICT (modify/delete): rtest/windows/ER.ps deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/ER.ps left in tree.
>CONFLICT (modify/delete): rtest/windows/ER.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/windows/ER.gv left in tree.
>Removing rtest/whichcc
>CONFLICT (modify/delete): rtest/tests.txt deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/tests.txt left in tree.
>Removing rtest/strps.awk
>Removing rtest/share/world.gv
>Removing rtest/share/viewfile.gv
>Removing rtest/share/unix2k.gv
>Removing rtest/share/unix2.gv
>Removing rtest/share/unix.ps
>Removing rtest/share/unix.gv
>Removing rtest/share/try.gv
>Removing rtest/share/triedds.gv
>Removing rtest/share/tree.gv
>Removing rtest/share/trapeziumlr.gv
>Removing rtest/share/train11.gv
>Removing rtest/share/structs.ps
>Removing rtest/share/structs.gv
>Removing rtest/share/states.gv
>Removing rtest/share/sq_rules.png
>Removing rtest/share/shells.gv
>Removing rtest/share/rowe.gv
>Removing rtest/share/records.gv
>Removing rtest/share/record2.gv
>Removing rtest/share/rd_rules.png
>Removing rtest/share/ps.ps
>Removing rtest/share/process.ps
>Removing rtest/share/process.gv
>Removing rtest/share/proc3d.gv
>Removing rtest/share/polypoly.gv
>Removing rtest/share/pmpipe.gv
>Removing rtest/share/pm2way.gv
>Removing rtest/share/pgram.gv
>Removing rtest/share/p4.ps
>Removing rtest/share/p3.ps
>Removing rtest/share/p2.ps
>Removing rtest/share/p.ps
>Removing rtest/share/nhg.gv
>Removing rtest/share/ngk10_4.ps
>Removing rtest/share/ngk10_4.gv
>Removing rtest/share/newarrows.ps
>Removing rtest/share/newarrows.gv
>Removing rtest/share/newarrows.gif
>Removing rtest/share/multi.ps
>Removing rtest/share/mike.gv
>Removing rtest/share/lsunix3.ps
>Removing rtest/share/lsunix2.ps
>Removing rtest/share/lsunix1.ps
>Removing rtest/share/longflat.gv
>Removing rtest/share/ldbxtried.gv
>Removing rtest/share/layer2.ps
>Removing rtest/share/layer.ps
>Removing rtest/share/labelroot-ntr.gv
>Removing rtest/share/labelroot-ntl.gv
>Removing rtest/share/labelroot-ntd.gv
>Removing rtest/share/labelroot-ntc.gv
>Removing rtest/share/labelroot-ndr.gv
>Removing rtest/share/labelroot-ndl.gv
>Removing rtest/share/labelroot-ndd.gv
>Removing rtest/share/labelroot-ndc.gv
>Removing rtest/share/labelroot-nbr.gv
>Removing rtest/share/labelroot-nbl.gv
>Removing rtest/share/labelroot-nbd.gv
>Removing rtest/share/labelroot-nbc.gv
>Removing rtest/share/labelroot-ftr.gv
>Removing rtest/share/labelroot-ftl.gv
>Removing rtest/share/labelroot-ftd.gv
>Removing rtest/share/labelroot-ftc.gv
>Removing rtest/share/labelroot-fdr.gv
>Removing rtest/share/labelroot-fdl.gv
>Removing rtest/share/labelroot-fdd.gv
>Removing rtest/share/labelroot-fdc.gv
>Removing rtest/share/labelroot-fbr.gv
>Removing rtest/share/labelroot-fbl.gv
>Removing rtest/share/labelroot-fbd.gv
>Removing rtest/share/labelroot-fbc.gv
>Removing rtest/share/labelclust-ntr.gv
>Removing rtest/share/labelclust-ntl.gv
>Removing rtest/share/labelclust-ntd.gv
>Removing rtest/share/labelclust-ntc.gv
>Removing rtest/share/labelclust-ndr.gv
>Removing rtest/share/labelclust-ndl.gv
>Removing rtest/share/labelclust-ndd.gv
>Removing rtest/share/labelclust-ndc.gv
>Removing rtest/share/labelclust-nbr.gv
>Removing rtest/share/labelclust-nbl.gv
>Removing rtest/share/labelclust-nbd.gv
>Removing rtest/share/labelclust-nbc.gv
>Removing rtest/share/labelclust-ftr.gv
>Removing rtest/share/labelclust-ftl.gv
>Removing rtest/share/labelclust-ftd.gv
>Removing rtest/share/labelclust-ftc.gv
>Removing rtest/share/labelclust-fdr.gv
>Removing rtest/share/labelclust-fdl.gv
>Removing rtest/share/labelclust-fdd.gv
>Removing rtest/share/labelclust-fdc.gv
>Removing rtest/share/labelclust-fbr.gv
>Removing rtest/share/labelclust-fbl.gv
>Removing rtest/share/labelclust-fbd.gv
>Removing rtest/share/labelclust-fbc.gv
>Removing rtest/share/jsort.gv
>Removing rtest/share/jcctree.gv
>Removing rtest/share/in.ps
>Removing rtest/share/hashtable.gv
>Removing rtest/share/grammar.gv
>Removing rtest/share/fsm.gv
>Removing rtest/share/flatedge.gv
>Removing rtest/share/fig6.gv
>Removing rtest/share/dpd5.ps
>Removing rtest/share/dpd4.ps
>Removing rtest/share/dpd3.ps
>Removing rtest/share/dpd2.ps
>Removing rtest/share/dpd1.ps
>Removing rtest/share/dpd.ps
>Removing rtest/share/dfa.gv
>Removing rtest/share/ctext.gv
>Removing rtest/share/crazy.ps
>Removing rtest/share/crazy.gv
>Removing rtest/share/clust5.gv
>Removing rtest/share/clust4.gv
>Removing rtest/share/clust3.gv
>Removing rtest/share/clust2.gv
>Removing rtest/share/clust1.gv
>Removing rtest/share/clust.gv
>Removing rtest/share/clover.ps
>Removing rtest/share/biglabel.ps
>Removing rtest/share/big.ps
>Removing rtest/share/b94.gv
>Removing rtest/share/b81.svg
>Removing rtest/share/b80.ps
>Removing rtest/share/b79.jpg
>Removing rtest/share/b786.gv
>Removing rtest/share/b77.ps
>Removing rtest/share/b71.ps
>Removing rtest/share/b7.ps
>Removing rtest/share/b69.ps
>Removing rtest/share/b68.ps
>Removing rtest/share/b62.plain
>Removing rtest/share/b60.gif
>Removing rtest/share/b57.ps
>Removing rtest/share/b56.gif
>Removing rtest/share/b545.plain-ext
>Removing rtest/share/b545.gv
>Removing rtest/share/b51.gv
>Removing rtest/share/b491.gv
>Removing rtest/share/b36.gv
>Removing rtest/share/b34.gif
>Removing rtest/share/b33.ps
>Removing rtest/share/b3.ps
>Removing rtest/share/b29.gv
>Removing rtest/share/b22.ps
>Removing rtest/share/b155.ps
>Removing rtest/share/b15.png
>Removing rtest/share/b145.png
>Removing rtest/share/b135.ps
>Removing rtest/share/b124.gv
>Removing rtest/share/b117a.ps
>Removing rtest/share/b117.ps
>Removing rtest/share/b106.gv
>Removing rtest/share/b102.gv
>Removing rtest/share/alf.gv
>Removing rtest/share/abstract.gv
>Removing rtest/share/a3.gv
>Removing rtest/share/a2.gv
>Removing rtest/share/a1.gv
>Removing rtest/share/Petersen.ps
>Removing rtest/share/Petersen.gv
>Removing rtest/share/NaN.gv
>Removing rtest/share/Latin1.gv
>Removing rtest/share/KW91.gv
>Removing rtest/share/Heawood.ps
>Removing rtest/share/Heawood.gv
>Removing rtest/share/ER.ps
>Removing rtest/share/ER.gv
>CONFLICT (modify/delete): rtest/rtest.sh deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/rtest.sh left in tree.
>Removing rtest/nshare/xlabels_neato.png
>Removing rtest/nshare/xlabels_dot.png
>Removing rtest/nshare/weight_dot.gv
>Removing rtest/nshare/viewport_neato2.ps
>Removing rtest/nshare/viewport_neato2.png
>Removing rtest/nshare/viewport_neato1.ps
>Removing rtest/nshare/viewport_neato1.png
>Removing rtest/nshare/viewport_neato.ps
>Removing rtest/nshare/viewport_neato.png
>Removing rtest/nshare/val_val_dot.png
>Removing rtest/nshare/val_nul_dot.png
>Removing rtest/nshare/val_inv_dot.png
>Removing rtest/nshare/user_shapes_dot_gd.png
>Removing rtest/nshare/user_shapes_dot.ps
>Removing rtest/nshare/url_dot.svg
>Removing rtest/nshare/url_dot.ps2
>Removing rtest/nshare/url_dot.imap_np
>Removing rtest/nshare/url_dot.imap
>Removing rtest/nshare/url_dot.cmapx_np
>Removing rtest/nshare/url_dot.cmapx
>Removing rtest/nshare/style_dot.ps
>Removing rtest/nshare/style_dot.png
>Removing rtest/nshare/st_circle_dot.png
>Removing rtest/nshare/st_circle_dbl_dot.png
>Removing rtest/nshare/st_box_dot.png
>Removing rtest/nshare/st_box_dbl_dot.png
>Removing rtest/nshare/sr_circle_dot.png
>Removing rtest/nshare/sr_circle_dbl_dot.png
>Removing rtest/nshare/sr_box_dot.png
>Removing rtest/nshare/sr_box_dbl_dot.png
>Removing rtest/nshare/sq_rules_dot.png
>Removing rtest/nshare/sl_circle_dot.png
>Removing rtest/nshare/sl_circle_dbl_dot.png
>Removing rtest/nshare/sl_box_dot.png
>Removing rtest/nshare/sl_box_dbl_dot.png
>Removing rtest/nshare/size_neato.ps
>Removing rtest/nshare/size_neato.png
>Removing rtest/nshare/size_ex_dot.ps
>Removing rtest/nshare/size_ex_dot.png
>Removing rtest/nshare/sides_dot.ps
>Removing rtest/nshare/shapes_dot.ps
>Removing rtest/nshare/shapes_dot.gv
>Removing rtest/nshare/sb_circle_dot.png
>Removing rtest/nshare/sb_circle_dbl_dot.png
>Removing rtest/nshare/sb_box_dot.png
>Removing rtest/nshare/sb_box_dbl_dot.png
>Removing rtest/nshare/russian_dot.png
>Removing rtest/nshare/rowcolsep_dot1.gv
>Removing rtest/nshare/rowcolsep_dot.gv
>Removing rtest/nshare/rotate_dot1.ps
>Removing rtest/nshare/rotate_dot1.png
>Removing rtest/nshare/rotate_dot.ps
>Removing rtest/nshare/rotate_dot.png
>Removing rtest/nshare/rootlabel_dot7.ps
>Removing rtest/nshare/rootlabel_dot6.ps
>Removing rtest/nshare/rootlabel_dot5.ps
>Removing rtest/nshare/rootlabel_dot4.ps
>Removing rtest/nshare/rootlabel_dot3.ps
>Removing rtest/nshare/rootlabel_dot2.ps
>Removing rtest/nshare/rootlabel_dot1.ps
>Removing rtest/nshare/rootlabel_dot.ps
>Removing rtest/nshare/root_twopi.gv
>Removing rtest/nshare/root_circo.gv
>Removing rtest/nshare/record_dot.ps
>Removing rtest/nshare/record_dot.gv
>Removing rtest/nshare/rd_rules_dot.png
>Removing rtest/nshare/rankdir_dot2.gv
>Removing rtest/nshare/rankdir_dot1.gv
>Removing rtest/nshare/rankdir_dot.gv
>Removing rtest/nshare/pslib_dot.ps
>Removing rtest/nshare/ps_user_shapes_dot.ps
>Removing rtest/nshare/ports_dot.gv
>Removing rtest/nshare/polypoly_dot.ps
>Removing rtest/nshare/polypoly_dot.png
>Removing rtest/nshare/page_neato2.ps
>Removing rtest/nshare/page_neato1.ps
>Removing rtest/nshare/page_neato.ps
>Removing rtest/nshare/pack_neato2.gv
>Removing rtest/nshare/pack_neato1.gv
>Removing rtest/nshare/pack_neato.gv
>Removing rtest/nshare/overlap_neato1.gv
>Removing rtest/nshare/overlap_neato.gv
>Removing rtest/nshare/ordering_dot1.gv
>Removing rtest/nshare/ordering_dot.gv
>Removing rtest/nshare/nul_val_dot.png
>Removing rtest/nshare/nul_nul_dot.png
>Removing rtest/nshare/nul_inv_dot.png
>Removing rtest/nshare/nojustify_dot_gd.png
>Removing rtest/nshare/nojustify_dot_cairo.ps
>Removing rtest/nshare/nojustify_dot.ps
>Removing rtest/nshare/nojustify_dot.png
>Removing rtest/nshare/nestedclust_dot.gv
>Removing rtest/nshare/neatosplines_neato1.gv
>Removing rtest/nshare/neatosplines_neato.gv
>Removing rtest/nshare/model_neato1.ps
>Removing rtest/nshare/model_neato.ps
>Removing rtest/nshare/mode_neato2.ps
>Removing rtest/nshare/mode_neato1.ps
>Removing rtest/nshare/mode_neato.ps
>Removing rtest/nshare/layers_dot.ps
>Removing rtest/nshare/japanese_dot.png
>Removing rtest/nshare/inv_val_dot.png
>Removing rtest/nshare/inv_nul_dot.png
>Removing rtest/nshare/inv_inv_dot.png
>Removing rtest/nshare/html_dot.ps
>Removing rtest/nshare/html_dot.gv
>Removing rtest/nshare/html2_dot.ps
>Removing rtest/nshare/html2_dot.gv
>Removing rtest/nshare/grdshapes_dot.svg
>Removing rtest/nshare/grdshapes_dot.png
>Removing rtest/nshare/grdradial_node_dot.svg
>Removing rtest/nshare/grdradial_node_dot.png
>Removing rtest/nshare/grdradial_dot.svg
>Removing rtest/nshare/grdradial_dot.png
>Removing rtest/nshare/grdradial_angle_dot.svg
>Removing rtest/nshare/grdradial_angle_dot.png
>Removing rtest/nshare/grdlinear_node_dot.svg
>Removing rtest/nshare/grdlinear_node_dot.png
>Removing rtest/nshare/grdlinear_dot.svg
>Removing rtest/nshare/grdlinear_dot.png
>Removing rtest/nshare/grdlinear_angle_dot.svg
>Removing rtest/nshare/grdlinear_angle_dot.png
>Removing rtest/nshare/grdfillcolor_dot.svg
>Removing rtest/nshare/grdfillcolor_dot.png
>Removing rtest/nshare/grdcolors_dot.svg
>Removing rtest/nshare/grdcolors_dot.png
>Removing rtest/nshare/grdcluster_dot.svg
>Removing rtest/nshare/grdcluster_dot.png
>Removing rtest/nshare/grdangles_dot.svg
>Removing rtest/nshare/grdangles_dot.png
>Removing rtest/nshare/flatedge_dot.gv
>Removing rtest/nshare/fdp_clus_fdp.png
>Removing rtest/nshare/edgeclip_dot.gv
>Removing rtest/nshare/dotsplines_dot1.gv
>Removing rtest/nshare/dotsplines_dot.gv
>Removing rtest/nshare/dir_dot.ps
>Removing rtest/nshare/decorate_dot.png
>Removing rtest/nshare/crazy_dot.ps
>Removing rtest/nshare/crazy_dot.png
>Removing rtest/nshare/compound_dot.gv
>Removing rtest/nshare/colorscheme_dot.ps
>Removing rtest/nshare/colorscheme_dot.png
>Removing rtest/nshare/colors_dot.ps
>Removing rtest/nshare/color_dot1.png
>Removing rtest/nshare/color_dot.png
>Removing rtest/nshare/clustlabel_dot7.ps
>Removing rtest/nshare/clustlabel_dot6.ps
>Removing rtest/nshare/clustlabel_dot5.ps
>Removing rtest/nshare/clustlabel_dot4.ps
>Removing rtest/nshare/clustlabel_dot3.ps
>Removing rtest/nshare/clustlabel_dot2.ps
>Removing rtest/nshare/clustlabel_dot1.ps
>Removing rtest/nshare/clustlabel_dot.ps
>Removing rtest/nshare/clusters_dot.ps
>Removing rtest/nshare/clusters_dot.png
>Removing rtest/nshare/center_dot.ps
>Removing rtest/nshare/center_dot.png
>Removing rtest/nshare/cairo_dot_cairo.svg
>Removing rtest/nshare/cairo_dot_cairo.ps
>Removing rtest/nshare/cairo_dot_cairo.png
>Removing rtest/nshare/arrowsize_dot.png
>Removing rtest/nshare/arrows_dot.ps
>Removing rtest/nshare/arrows_dot.gv
>Removing rtest/nshare/ZapfDingbats_dot.ps
>Removing rtest/nshare/ZapfDingbats_dot.png
>Removing rtest/nshare/ZapfChancery_dot.ps
>Removing rtest/nshare/ZapfChancery_dot.png
>Removing rtest/nshare/Times_dot.ps
>Removing rtest/nshare/Times_dot.png
>Removing rtest/nshare/Symbol_dot.png
>Removing rtest/nshare/Palatino_dot.ps
>Removing rtest/nshare/Palatino_dot.png
>Removing rtest/nshare/NewCenturySchlbk_dot.ps
>Removing rtest/nshare/NewCenturySchlbk_dot.png
>Removing rtest/nshare/Helvetica_dot.ps
>Removing rtest/nshare/Helvetica_dot.png
>Removing rtest/nshare/Courier_dot.ps
>Removing rtest/nshare/Courier_dot.png
>Removing rtest/nshare/Bookman_dot.ps
>Removing rtest/nshare/Bookman_dot.png
>Removing rtest/nshare/AvantGarde_dot.ps
>Removing rtest/nshare/AvantGarde_dot.png
>CONFLICT (rename/delete): rtest/linux.x86/center_dot.ps deleted in Applied patch and renamed in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/linux.x86/center_dot.ps left in tree.
>Removing rtest/linux.i386/newarrows.gif
>Removing rtest/linux.i386/hashtable.gv
>Removing rtest/linux.i386/dfa.gv
>Removing rtest/linux.i386/crazy.ps
>Removing rtest/linux.i386/crazy.gv
>Removing rtest/linux.i386/b69.ps
>Removing rtest/linux.i386/b36.gv
>Removing rtest/linux.i386/b33.ps
>Removing rtest/linux.i386/b29.gv
>Removing rtest/linux.i386/b15.png
>Removing rtest/linux.i386/b106.gv
>Removing rtest/linux.i386/b102.gv
>Removing rtest/linux.i386/ER.ps
>Removing rtest/linux.i386/ER.gv
>Removing rtest/imagepath_test/test_cases
>Removing rtest/imagepath_test/save_png_files.sh
>CONFLICT (modify/delete): rtest/imagepath_test/imagepath_test.sh deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/imagepath_test/imagepath_test.sh left in tree.
>Removing rtest/imagepath_test/imagepath_dir/image.jpg
>Removing rtest/imagepath_test/image_dir/image.jpg
>Removing rtest/imagepath_test/image.jpg
>Removing rtest/imagepath_test/gen_graph.sh
>Removing rtest/imagepath_test/delim.sed
>Removing rtest/imagepath_test/base.gv
>Removing rtest/imagepath_test.txt
>Removing rtest/graphs/xx.gv
>Removing rtest/graphs/xlabels.gv
>Removing rtest/graphs/world.gv
>Removing rtest/graphs/weight.gv
>Removing rtest/graphs/viewport.gv
>Removing rtest/graphs/viewfile.gv
>CONFLICT (modify/delete): rtest/graphs/val_val.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/val_val.gv left in tree.
>CONFLICT (modify/delete): rtest/graphs/val_nul.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/val_nul.gv left in tree.
>CONFLICT (modify/delete): rtest/graphs/val_inv.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/val_inv.gv left in tree.
>Removing rtest/graphs/user_shapes.gv
>Removing rtest/graphs/url.gv
>Removing rtest/graphs/unix2k.gv
>Removing rtest/graphs/unix2.gv
>Removing rtest/graphs/unix.gv
>Removing rtest/graphs/try.gv
>Removing rtest/graphs/triedds.gv
>Removing rtest/graphs/tree.gv
>Removing rtest/graphs/trapeziumlr.gv
>Removing rtest/graphs/train11.gv
>Removing rtest/graphs/style.gv
>Removing rtest/graphs/structs.gv
>Removing rtest/graphs/states.gv
>Removing rtest/graphs/st_circle_dbl.gv
>Removing rtest/graphs/st_circle.gv
>Removing rtest/graphs/st_box_dbl.gv
>Removing rtest/graphs/st_box.gv
>Removing rtest/graphs/sr_circle_dbl.gv
>Removing rtest/graphs/sr_circle.gv
>Removing rtest/graphs/sr_box_dbl.gv
>Removing rtest/graphs/sr_box.gv
>Removing rtest/graphs/sq_rules.gv
>Removing rtest/graphs/sl_circle_dbl.gv
>Removing rtest/graphs/sl_circle.gv
>Removing rtest/graphs/sl_box_dbl.gv
>Removing rtest/graphs/sl_box.gv
>Removing rtest/graphs/size.gv
>Removing rtest/graphs/sides.gv
>Removing rtest/graphs/shells.gv
>Removing rtest/graphs/shapes.gv
>Removing rtest/graphs/sdl.ps
>Removing rtest/graphs/sb_circle_dbl.gv
>Removing rtest/graphs/sb_circle.gv
>Removing rtest/graphs/sb_box_dbl.gv
>Removing rtest/graphs/sb_box.gv
>Removing rtest/graphs/russian.gv
>Removing rtest/graphs/rowe.gv
>Removing rtest/graphs/rowcolsep.gv
>Removing rtest/graphs/rootlabel.gv
>Removing rtest/graphs/root.gv
>Removing rtest/graphs/records.gv
>Removing rtest/graphs/record2.gv
>Removing rtest/graphs/record.gv
>Removing rtest/graphs/rd_rules.gv
>Removing rtest/graphs/pslib.gv
>Removing rtest/graphs/ps_user_shapes.gv
>Removing rtest/graphs/ps.gv
>Removing rtest/graphs/process.gv
>Removing rtest/graphs/proc3d.gv
>Removing rtest/graphs/ports.gv
>Removing rtest/graphs/polypoly.gv
>Removing rtest/graphs/pmpipe.gv
>Removing rtest/graphs/pm2way.gv
>Removing rtest/graphs/pgram.gv
>Removing rtest/graphs/pack.gv
>Removing rtest/graphs/p4.gv
>Removing rtest/graphs/p3.gv
>Removing rtest/graphs/p2.gv
>Removing rtest/graphs/p.gv
>Removing rtest/graphs/overlap.gv
>Removing rtest/graphs/ordering.gv
>CONFLICT (modify/delete): rtest/graphs/nul_val.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/nul_val.gv left in tree.
>Removing rtest/graphs/nul_nul.gv
>Removing rtest/graphs/nul_inv.gv
>Removing rtest/graphs/nojustify.gv
>Removing rtest/graphs/nhg.gv
>Removing rtest/graphs/ngk10_4.gv
>Removing rtest/graphs/newarrows.gv
>Removing rtest/graphs/nestedclust.gv
>Removing rtest/graphs/multi.gv
>Removing rtest/graphs/mode.gv
>Removing rtest/graphs/mike.gv
>Removing rtest/graphs/lsunix3.gv
>Removing rtest/graphs/lsunix2.gv
>Removing rtest/graphs/lsunix1.gv
>Removing rtest/graphs/longflat.gv
>Removing rtest/graphs/ldbxtried.gv
>Removing rtest/graphs/layers.gv
>Removing rtest/graphs/layer2.gv
>Removing rtest/graphs/layer.gv
>Removing rtest/graphs/labelroot-ntr.gv
>Removing rtest/graphs/labelroot-ntl.gv
>Removing rtest/graphs/labelroot-ntd.gv
>Removing rtest/graphs/labelroot-ntc.gv
>Removing rtest/graphs/labelroot-ndr.gv
>Removing rtest/graphs/labelroot-ndl.gv
>Removing rtest/graphs/labelroot-ndd.gv
>Removing rtest/graphs/labelroot-ndc.gv
>Removing rtest/graphs/labelroot-nbr.gv
>Removing rtest/graphs/labelroot-nbl.gv
>Removing rtest/graphs/labelroot-nbd.gv
>Removing rtest/graphs/labelroot-nbc.gv
>Removing rtest/graphs/labelroot-ftr.gv
>Removing rtest/graphs/labelroot-ftl.gv
>Removing rtest/graphs/labelroot-ftd.gv
>Removing rtest/graphs/labelroot-ftc.gv
>Removing rtest/graphs/labelroot-fdr.gv
>Removing rtest/graphs/labelroot-fdl.gv
>Removing rtest/graphs/labelroot-fdd.gv
>Removing rtest/graphs/labelroot-fdc.gv
>Removing rtest/graphs/labelroot-fbr.gv
>Removing rtest/graphs/labelroot-fbl.gv
>Removing rtest/graphs/labelroot-fbd.gv
>Removing rtest/graphs/labelroot-fbc.gv
>Removing rtest/graphs/labelclust-ntr.gv
>Removing rtest/graphs/labelclust-ntl.gv
>Removing rtest/graphs/labelclust-ntd.gv
>Removing rtest/graphs/labelclust-ntc.gv
>Removing rtest/graphs/labelclust-ndr.gv
>Removing rtest/graphs/labelclust-ndl.gv
>Removing rtest/graphs/labelclust-ndd.gv
>Removing rtest/graphs/labelclust-ndc.gv
>Removing rtest/graphs/labelclust-nbr.gv
>Removing rtest/graphs/labelclust-nbl.gv
>Removing rtest/graphs/labelclust-nbd.gv
>Removing rtest/graphs/labelclust-nbc.gv
>Removing rtest/graphs/labelclust-ftr.gv
>Removing rtest/graphs/labelclust-ftl.gv
>Removing rtest/graphs/labelclust-ftd.gv
>Removing rtest/graphs/labelclust-ftc.gv
>Removing rtest/graphs/labelclust-fdr.gv
>Removing rtest/graphs/labelclust-fdl.gv
>Removing rtest/graphs/labelclust-fdd.gv
>Removing rtest/graphs/labelclust-fdc.gv
>Removing rtest/graphs/labelclust-fbr.gv
>Removing rtest/graphs/labelclust-fbl.gv
>Removing rtest/graphs/labelclust-fbd.gv
>Removing rtest/graphs/labelclust-fbc.gv
>Removing rtest/graphs/jsort.gv
>Removing rtest/graphs/jcr.gif
>Removing rtest/graphs/jcctree.gv
>Removing rtest/graphs/japanese.gv
>CONFLICT (modify/delete): rtest/graphs/inv_val.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/inv_val.gv left in tree.
>Removing rtest/graphs/inv_nul.gv
>Removing rtest/graphs/inv_inv.gv
>Removing rtest/graphs/in.gv
>CONFLICT (modify/delete): rtest/graphs/html2.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/html2.gv left in tree.
>Removing rtest/graphs/html.gv
>Removing rtest/graphs/honda-tokoro.gv
>Removing rtest/graphs/hashtable.gv
>Removing rtest/graphs/grdshapes.gv
>Removing rtest/graphs/grdradial_node.gv
>Removing rtest/graphs/grdradial_angle.gv
>Removing rtest/graphs/grdradial.gv
>Removing rtest/graphs/grdlinear_node.gv
>Removing rtest/graphs/grdlinear_angle.gv
>Removing rtest/graphs/grdlinear.gv
>Removing rtest/graphs/grdfillcolor.gv
>Removing rtest/graphs/grdcolors.gv
>Removing rtest/graphs/grdcluster.gv
>Removing rtest/graphs/grdangles.gv
>Removing rtest/graphs/grammar.gv
>Removing rtest/graphs/fsm.gv
>Removing rtest/graphs/flatedge.gv
>Removing rtest/graphs/fig6.gv
>Removing rtest/graphs/fdp.gv
>Removing rtest/graphs/edgeclip.gv
>Removing rtest/graphs/dpd.gv
>Removing rtest/graphs/dir.gv
>Removing rtest/graphs/dice.ps
>Removing rtest/graphs/dfd.ps
>Removing rtest/graphs/dfa.gv
>Removing rtest/graphs/decorate.gv
>Removing rtest/graphs/dd.gv
>Removing rtest/graphs/d.gv
>Removing rtest/graphs/ctext.gv
>Removing rtest/graphs/crazy.gv
>Removing rtest/graphs/compound.gv
>Removing rtest/graphs/colorscheme.gv
>Removing rtest/graphs/colors.gv
>Removing rtest/graphs/color.gv
>Removing rtest/graphs/clustlabel.gv
>Removing rtest/graphs/clusters.gv
>Removing rtest/graphs/clust5.gv
>Removing rtest/graphs/clust4.gv
>Removing rtest/graphs/clust3.gv
>Removing rtest/graphs/clust2.gv
>Removing rtest/graphs/clust1.gv
>Removing rtest/graphs/clust.gv
>Removing rtest/graphs/clover.gv
>Removing rtest/graphs/center.gv
>CONFLICT (modify/delete): rtest/graphs/cairo.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/cairo.gv left in tree.
>Removing rtest/graphs/biglabel.gv
>Removing rtest/graphs/big.gv
>Removing rtest/graphs/badvoro.gv
>Removing rtest/graphs/bad.gv
>CONFLICT (modify/delete): rtest/graphs/b993.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/b993.gv left in tree.
>Removing rtest/graphs/b94.gv
>Removing rtest/graphs/b85.gv
>Removing rtest/graphs/b81.gv
>Removing rtest/graphs/b80a.gv
>Removing rtest/graphs/b80.gv
>Removing rtest/graphs/b79.gv
>Removing rtest/graphs/b786.gv
>Removing rtest/graphs/b77.gv
>Removing rtest/graphs/b76.gv
>Removing rtest/graphs/b73a.gv
>Removing rtest/graphs/b73.gv
>Removing rtest/graphs/b71.gv
>Removing rtest/graphs/b7.gv
>Removing rtest/graphs/b69.gv
>Removing rtest/graphs/b68.gv
>Removing rtest/graphs/b62.gv
>Removing rtest/graphs/b60.gv
>Removing rtest/graphs/b58.gv
>Removing rtest/graphs/b57.gv
>Removing rtest/graphs/b56.gv
>CONFLICT (modify/delete): rtest/graphs/b545.gv deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of rtest/graphs/b545.gv left in tree.
>Removing rtest/graphs/b53.gv
>Removing rtest/graphs/b51.gv
>Removing rtest/graphs/b491.gv
>Removing rtest/graphs/b36.gv
>Removing rtest/graphs/b34.gv
>Removing rtest/graphs/b33.gv
>Removing rtest/graphs/b3.gv
>Removing rtest/graphs/b29.gv
>Removing rtest/graphs/b22.gv
>Removing rtest/graphs/b155.gv
>Removing rtest/graphs/b15.gv
>Removing rtest/graphs/b146.gv
>Removing rtest/graphs/b145.gv
>Removing rtest/graphs/b143.gv
>Removing rtest/graphs/b135.gv
>Removing rtest/graphs/b124.gv
>Removing rtest/graphs/b123.gv
>Removing rtest/graphs/b117.gv
>Removing rtest/graphs/b106.gv
>Removing rtest/graphs/b104.gv
>Removing rtest/graphs/b103.gv
>Removing rtest/graphs/b102.gv
>Removing rtest/graphs/b100.gv
>Removing rtest/graphs/b.gv
>Removing rtest/graphs/awilliams.gv
>Removing rtest/graphs/arrowsize.gv
>Removing rtest/graphs/arrows.gv
>Removing rtest/graphs/alf.gv
>Removing rtest/graphs/abstract.gv
>Removing rtest/graphs/a.gv
>Removing rtest/graphs/ZapfDingbats.gv
>Removing rtest/graphs/ZapfChancery.gv
>Removing rtest/graphs/Times.gv
>Removing rtest/graphs/Symbol.gv
>Removing rtest/graphs/Petersen.gv
>Removing rtest/graphs/Palatino.gv
>Removing rtest/graphs/NewCenturySchlbk.gv
>Removing rtest/graphs/NaN.gv
>Removing rtest/graphs/Latin1.gv
>Removing rtest/graphs/KW91.gv
>Removing rtest/graphs/Helvetica.gv
>Removing rtest/graphs/Heawood.gv
>Removing rtest/graphs/ER.gv
>Removing rtest/graphs/Courier.gv
>Removing rtest/graphs/Bookman.gv
>Removing rtest/graphs/AvantGarde.gv
>Removing rtest/gradient_test.txt
>Removing rtest/font_tests.txt
>Removing rtest/edgepath_test.txt
>Removing rtest/doted
>Removing rtest/dotdiff
>Removing rtest/doit
>Removing rtest/cdiff.c
>Removing rtest/Makefile.am
>Removing rpm_notes.txt
>CONFLICT (modify/delete): plugin/xlib/vimdot.sh deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/xlib/vimdot.sh left in tree.
>Removing plugin/xlib/vimdot.1
>Removing plugin/xlib/gvplugin_xlib.c
>CONFLICT (modify/delete): plugin/xlib/gvdevice_xlib.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/xlib/gvdevice_xlib.c left in tree.
>Removing plugin/xlib/Makefile.am
>Removing plugin/webp/gvplugin_webp.c
>CONFLICT (modify/delete): plugin/webp/gvloadimage_webp.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/webp/gvloadimage_webp.c left in tree.
>CONFLICT (modify/delete): plugin/webp/gvdevice_webp.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/webp/gvdevice_webp.c left in tree.
>Removing plugin/webp/Makefile.am
>CONFLICT (modify/delete): plugin/visio/gvrender_visio_vdx.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/gvrender_visio_vdx.cpp left in tree.
>Removing plugin/visio/gvplugin_visio.vcproj.user
>CONFLICT (modify/delete): plugin/visio/gvplugin_visio.vcproj.RESEARCH.arif.user deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/gvplugin_visio.vcproj.RESEARCH.arif.user left in tree.
>Removing plugin/visio/gvplugin_visio.suo
>CONFLICT (modify/delete): plugin/visio/gvplugin_visio.sln deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/gvplugin_visio.sln left in tree.
>Removing plugin/visio/gvplugin_visio.ncb
>CONFLICT (modify/delete): plugin/visio/gvplugin_visio.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/gvplugin_visio.c left in tree.
>Removing plugin/visio/VisioText.h
>CONFLICT (modify/delete): plugin/visio/VisioText.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/VisioText.cpp left in tree.
>Removing plugin/visio/VisioRender.h
>CONFLICT (modify/delete): plugin/visio/VisioRender.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/VisioRender.cpp left in tree.
>Removing plugin/visio/VisioGraphic.h
>CONFLICT (modify/delete): plugin/visio/VisioGraphic.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/visio/VisioGraphic.cpp left in tree.
>Removing plugin/visio/Makefile.am
>Removing plugin/rsvg/gvplugin_rsvg.c
>CONFLICT (modify/delete): plugin/rsvg/gvloadimage_rsvg.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/rsvg/gvloadimage_rsvg.c left in tree.
>CONFLICT (modify/delete): plugin/rsvg/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/rsvg/Makefile.am left in tree.
>CONFLICT (modify/delete): plugin/quartz/gvtextlayout_quartz.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/quartz/gvtextlayout_quartz.c left in tree.
>CONFLICT (modify/delete): plugin/quartz/gvrender_quartz.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/quartz/gvrender_quartz.c left in tree.
>Removing plugin/quartz/gvplugin_quartz.h
>CONFLICT (modify/delete): plugin/quartz/gvplugin_quartz.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/quartz/gvplugin_quartz.c left in tree.
>CONFLICT (modify/delete): plugin/quartz/gvloadimage_quartz.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/quartz/gvloadimage_quartz.c left in tree.
>CONFLICT (modify/delete): plugin/quartz/gvdevice_quartz.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/quartz/gvdevice_quartz.c left in tree.
>Removing plugin/quartz/Makefile.am
>CONFLICT (modify/delete): plugin/quartz/GVTextLayout.m deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/quartz/GVTextLayout.m left in tree.
>Removing plugin/quartz/GVTextLayout.h
>Removing plugin/poppler/gvplugin_poppler.c
>CONFLICT (modify/delete): plugin/poppler/gvloadimage_poppler.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/poppler/gvloadimage_poppler.c left in tree.
>Removing plugin/poppler/Makefile.am
>CONFLICT (modify/delete): plugin/pango/gvtextlayout_pango.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/gvtextlayout_pango.c left in tree.
>CONFLICT (modify/delete): plugin/pango/gvrender_pango.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/gvrender_pango.c left in tree.
>Removing plugin/pango/gvplugin_pango.h
>CONFLICT (modify/delete): plugin/pango/gvplugin_pango.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/gvplugin_pango.c left in tree.
>CONFLICT (modify/delete): plugin/pango/gvloadimage_pango.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/gvloadimage_pango.c left in tree.
>CONFLICT (modify/delete): plugin/pango/gvgetfontlist_pango.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/gvgetfontlist_pango.c left in tree.
>CONFLICT (modify/delete): plugin/pango/gvgetfontlist.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/gvgetfontlist.h left in tree.
>CONFLICT (modify/delete): plugin/pango/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/pango/Makefile.am left in tree.
>CONFLICT (modify/delete): plugin/ming/gvrender_ming.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/ming/gvrender_ming.c left in tree.
>Removing plugin/ming/gvplugin_ming.c
>Removing plugin/ming/Makefile.am
>Removing plugin/ming/Bitstream_Vera_Serif.fdb
>Removing plugin/ming/Bitstream_Vera_Sans.fdb
>CONFLICT (modify/delete): plugin/lasi/gvrender_lasi.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/lasi/gvrender_lasi.cpp left in tree.
>Removing plugin/lasi/gvplugin_lasi.c
>CONFLICT (modify/delete): plugin/lasi/gvloadimage_lasi.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/lasi/gvloadimage_lasi.c left in tree.
>Removing plugin/lasi/Makefile.am
>CONFLICT (modify/delete): plugin/gtk/support.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gtk/support.h left in tree.
>CONFLICT (modify/delete): plugin/gtk/support.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gtk/support.c left in tree.
>Removing plugin/gtk/interface.h
>CONFLICT (modify/delete): plugin/gtk/interface.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gtk/interface.c left in tree.
>Removing plugin/gtk/gvplugin_gtk.c
>CONFLICT (modify/delete): plugin/gtk/gvdevice_gtk.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gtk/gvdevice_gtk.c left in tree.
>Removing plugin/gtk/gtk.gladep
>Removing plugin/gtk/gtk.glade
>Removing plugin/gtk/callbacks.h
>CONFLICT (modify/delete): plugin/gtk/callbacks.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gtk/callbacks.c left in tree.
>Removing plugin/gtk/Makefile.am
>Removing plugin/gs/gvplugin_gs.c
>CONFLICT (modify/delete): plugin/gs/gvloadimage_gs.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gs/gvloadimage_gs.c left in tree.
>Removing plugin/gs/Makefile.am
>Removing plugin/glitz/gvplugin_glitz.c
>CONFLICT (modify/delete): plugin/glitz/gvdevice_glitz.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/glitz/gvdevice_glitz.c left in tree.
>Removing plugin/glitz/Makefile.am
>Removing plugin/gdk/gvplugin_gdk.c
>CONFLICT (modify/delete): plugin/gdk/gvloadimage_gdk.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdk/gvloadimage_gdk.c left in tree.
>CONFLICT (modify/delete): plugin/gdk/gvdevice_gdk.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdk/gvdevice_gdk.c left in tree.
>Removing plugin/gdk/Makefile.am
>CONFLICT (modify/delete): plugin/gdiplus/gvtextlayout_gdiplus.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/gvtextlayout_gdiplus.cpp left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/gvrender_gdiplus.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/gvrender_gdiplus.cpp left in tree.
>Removing plugin/gdiplus/gvplugin_gdiplus.h
>CONFLICT (modify/delete): plugin/gdiplus/gvplugin_gdiplus.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/gvplugin_gdiplus.cpp left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/gvloadimage_gdiplus.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/gvloadimage_gdiplus.cpp left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/gvdevice_gdiplus.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/gvdevice_gdiplus.cpp left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/Makefile.am left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/GdiPlusimageAttributes.h.patch deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/GdiPlusimageAttributes.h.patch left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/GdiPlusImaging.h.patch deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/GdiPlusImaging.h.patch left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/GdiPlusHeaders.h.patch deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/GdiPlusHeaders.h.patch left in tree.
>CONFLICT (modify/delete): plugin/gdiplus/GdiPlusEnums.h.patch deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gdiplus/GdiPlusEnums.h.patch left in tree.
>Removing plugin/gdiplus/FileStream.h
>Removing plugin/gdiplus/FileStream.cpp
>CONFLICT (modify/delete): plugin/gd/gvtextlayout_gd.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/gvtextlayout_gd.c left in tree.
>CONFLICT (modify/delete): plugin/gd/gvrender_gd_vrml.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/gvrender_gd_vrml.c left in tree.
>CONFLICT (modify/delete): plugin/gd/gvrender_gd.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/gvrender_gd.c left in tree.
>CONFLICT (modify/delete): plugin/gd/gvplugin_gd.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/gvplugin_gd.c left in tree.
>CONFLICT (modify/delete): plugin/gd/gvloadimage_gd.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/gvloadimage_gd.c left in tree.
>CONFLICT (modify/delete): plugin/gd/gvdevice_gd.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/gvdevice_gd.c left in tree.
>CONFLICT (modify/delete): plugin/gd/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/gd/Makefile.am left in tree.
>Removing plugin/devil/gvplugin_devil.c
>CONFLICT (modify/delete): plugin/devil/gvdevice_devil.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin/devil/gvdevice_devil.c left in tree.
>Removing plugin/devil/Makefile.am
>Removing plugin/core/XFIG_FORMAT3.2.txt
>Removing plugin.demo/xgtk/xgtk-plugin.spec.in
>CONFLICT (modify/delete): plugin.demo/xgtk/src/support.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin.demo/xgtk/src/support.h left in tree.
>CONFLICT (modify/delete): plugin.demo/xgtk/src/support.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin.demo/xgtk/src/support.c left in tree.
>Removing plugin.demo/xgtk/src/interface.h
>CONFLICT (modify/delete): plugin.demo/xgtk/src/interface.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin.demo/xgtk/src/interface.c left in tree.
>Removing plugin.demo/xgtk/src/gvplugin_xgtk.c
>CONFLICT (modify/delete): plugin.demo/xgtk/src/gvdevice_xgtk.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin.demo/xgtk/src/gvdevice_xgtk.c left in tree.
>Removing plugin.demo/xgtk/src/gtk.gladep
>Removing plugin.demo/xgtk/src/gtk.glade
>Removing plugin.demo/xgtk/src/callbacks.h
>CONFLICT (modify/delete): plugin.demo/xgtk/src/callbacks.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of plugin.demo/xgtk/src/callbacks.c left in tree.
>Removing plugin.demo/xgtk/src/Makefile.am
>Removing plugin.demo/xgtk/epl-v10.txt
>Removing plugin.demo/xgtk/epl-v10.html
>Removing plugin.demo/xgtk/cpl1.0.txt
>Removing plugin.demo/xgtk/configure.ac
>Removing plugin.demo/xgtk/autogen.sh
>Removing plugin.demo/xgtk/README
>Removing plugin.demo/xgtk/NEWS
>Removing plugin.demo/xgtk/Makefile.am
>Removing plugin.demo/xgtk/ChangeLog
>Removing plugin.demo/xgtk/COPYING
>Removing plugin.demo/xgtk/AUTHORS
>Removing plugin.demo/README
>Removing macosx/prebuild/pixman.patch
>Removing macosx/prebuild/pango.patch
>Removing macosx/prebuild/glib.patch
>Removing macosx/prebuild/glib.leopard.patch
>Removing macosx/prebuild/gettext.patch
>Removing macosx/prebuild/fontconfig.patch
>Removing macosx/prebuild/cairo.patch
>Removing macosx/prebuild/TODO_smyrna
>Removing macosx/prebuild/Makefile.tiger
>Removing macosx/prebuild/Makefile.snowleopard
>Removing macosx/prebuild/Makefile.lion
>Removing macosx/prebuild/Makefile.leopard
>Removing macosx/prebuild/Makefile-packages.incl
>Removing macosx/main.m
>Removing macosx/graphviz_prefix.pch
>Removing macosx/graphviz.xcodeproj/snowleopard.project.pbxproj
>Removing macosx/graphviz.xcodeproj/project.pbxproj
>Removing macosx/graphviz.xcodeproj/mountainlion.project.pbxproj
>Removing macosx/graphviz.xcodeproj/lion.project.pbxproj
>Removing macosx/graphviz.xcodeproj/leopard.project.pbxproj
>Removing macosx/graphviz.xcodeproj/default.pbxuser
>Removing macosx/graphviz.help/graphviz.html
>Removing macosx/build/pmsurvey
>Removing macosx/build/graphviz.pmdoc/index.xml
>Removing macosx/build/graphviz.pmdoc/02graphviz.xml.in
>Removing macosx/build/graphviz.pmdoc/01local.xml.in
>Removing macosx/build/graphviz.help.helpindex.snowleopard
>Removing macosx/build/graphviz.help.helpindex.lion
>Removing macosx/build/Makefile.tiger
>Removing macosx/build/Makefile.snowleopard
>Removing macosx/build/Makefile.mountainlion
>Removing macosx/build/Makefile.lion
>Removing macosx/build/Makefile.leopard
>Removing macosx/build/English.lproj/License.rtf
>Removing macosx/ZoomToFitToolbarImage.tiff
>Removing macosx/ZoomOutToolbarImage.tiff
>Removing macosx/ZoomInToolbarImage.tiff
>Removing macosx/NodeAttributes.png
>Removing macosx/InspectorToolbarImage.tif
>Removing macosx/Info.plist.in
>Removing macosx/Graphviz.psd
>Removing macosx/Graphviz.icns
>Removing macosx/Graphviz.ai
>Removing macosx/GraphGv.icns
>Removing macosx/GraphDot.icns
>Removing macosx/GraphAttributes.png
>Removing macosx/Graph.ai
>CONFLICT (modify/delete): macosx/GVWindowController.m deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of macosx/GVWindowController.m left in tree.
>CONFLICT (modify/delete): macosx/GVWindowController.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of macosx/GVWindowController.h left in tree.
>Removing macosx/GVGraphDefaultAttributes.m
>Removing macosx/GVGraphDefaultAttributes.h
>Removing macosx/GVGraphArguments.m
>Removing macosx/GVGraphArguments.h
>Removing macosx/GVGraph.m
>Removing macosx/GVGraph.h
>Removing macosx/GVFileNotificationCenter.m
>Removing macosx/GVFileNotificationCenter.h
>Removing macosx/GVExportViewController.m
>Removing macosx/GVExportViewController.h
>Removing macosx/GVDocument.m
>Removing macosx/GVDocument.h
>Removing macosx/GVAttributeSchema.m
>Removing macosx/GVAttributeSchema.h
>Removing macosx/GVAttributeInspectorController.m
>Removing macosx/GVAttributeInspectorController.h
>Removing macosx/GVApplicationDelegate.m
>Removing macosx/GVApplicationDelegate.h
>Removing macosx/English.lproj/MainMenu.xib
>Removing macosx/English.lproj/InfoPlist.strings
>Removing macosx/English.lproj/Export.xib
>Removing macosx/English.lproj/Document.xib
>Removing macosx/English.lproj/Attributes.xib
>Removing macosx/EdgeAttributes.png
>Removing macosx/ActualSizeToolbarImage.tiff
>Removing m4/ming.m4
>Removing m4/lib-prefix.m4
>Removing m4/lib-link.m4
>Removing m4/lib-ld.m4
>Removing m4/iconv.m4
>Removing m4/glib-gettext.m4
>Removing m4/README
>Removing loadimage_test.sh
>Removing lib/pathplan/pathplan.def
>CONFLICT (modify/delete): lib/gvc.def deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of lib/gvc.def left in tree.
>CONFLICT (modify/delete): lib/graph/graph.vcproj deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of lib/graph/graph.vcproj left in tree.
>Removing lib/graph/graph.def
>Removing lib/edgepaint/lab_gamut.def
>CONFLICT (rename/delete): lib/circogen/blockpath.h deleted in Applied patch and renamed in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of lib/circogen/blockpath.h left in tree.
>Removing lib/agutil/agutil.vcproj
>CONFLICT (modify/delete): graphviz.sln deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of graphviz.sln left in tree.
>Removing graphviz.appdata.xml
>Removing graphs/undirected/process.gv
>Removing graphs/undirected/ngk10_4.gv
>Removing graphs/undirected/Petersen.gv
>Removing graphs/undirected/Makefile.am
>Removing graphs/undirected/Heawood.gv
>Removing graphs/undirected/ER.gv
>Removing graphs/directed/world.gv
>Removing graphs/directed/viewfile.gv
>Removing graphs/directed/unix2.gv
>Removing graphs/directed/unix.gv
>Removing graphs/directed/try.gv
>Removing graphs/directed/triedds.gv
>Removing graphs/directed/tree.gv
>Removing graphs/directed/trapeziumlr.gv
>Removing graphs/directed/train11.gv
>Removing graphs/directed/table.gv
>Removing graphs/directed/switch.gv
>Removing graphs/directed/structs.gv
>Removing graphs/directed/states.gv
>Removing graphs/directed/shells.gv
>Removing graphs/directed/sdh.gv
>Removing graphs/directed/russian.gv
>Removing graphs/directed/rowe.gv
>Removing graphs/directed/records.gv
>Removing graphs/directed/record2.gv
>Removing graphs/directed/psfonttest.gv
>Removing graphs/directed/proc3d.gv
>Removing graphs/directed/polypoly.gv
>Removing graphs/directed/pmpipe.gv
>Removing graphs/directed/pm2way.gv
>Removing graphs/directed/pgram.gv
>Removing graphs/directed/oldarrows.gv
>Removing graphs/directed/nhg.gv
>Removing graphs/directed/mike.gv
>Removing graphs/directed/longflat.gv
>Removing graphs/directed/ldbxtried.gv
>Removing graphs/directed/jsort.gv
>Removing graphs/directed/jcctree.gv
>Removing graphs/directed/japanese.gv
>Removing graphs/directed/honda-tokoro.gv
>Removing graphs/directed/hashtable.gv
>Removing graphs/directed/grammar.gv
>Removing graphs/directed/fsm.gv
>Removing graphs/directed/fig6.gv
>Removing graphs/directed/dfa.gv
>Removing graphs/directed/ctext.gv
>Removing graphs/directed/crazy.gv
>Removing graphs/directed/clust5.gv
>Removing graphs/directed/clust4.gv
>Removing graphs/directed/clust3.gv
>Removing graphs/directed/clust2.gv
>Removing graphs/directed/clust1.gv
>Removing graphs/directed/clust.gv
>Removing graphs/directed/biological.gv
>Removing graphs/directed/awilliams.gv
>Removing graphs/directed/arrows.gv
>Removing graphs/directed/arr_none.gv
>Removing graphs/directed/alf.gv
>Removing graphs/directed/abstract.gv
>Removing graphs/directed/NaN.gv
>Removing graphs/directed/Makefile.am
>Removing graphs/directed/Latin1.gv
>Removing graphs/directed/KW91.gv
>Removing graphs/Makefile.am
>Removing dot.demo/simple.c
>Removing dot.demo/neatopack.c
>Removing dot.demo/gv_test.py
>Removing dot.demo/example.c
>Removing dot.demo/dot_demo.vcproj
>Removing dot.demo/dot.c
>CONFLICT (modify/delete): dot.demo/demo.vcproj deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of dot.demo/demo.vcproj left in tree.
>Removing dot.demo/demo.c
>Removing dot.demo/Makefile.python_wrapper_builtins
>Removing dot.demo/Makefile.python_wrapper
>Removing dot.demo/Makefile.builtins
>Removing dot.demo/Makefile
>CONFLICT (modify/delete): doc/winbuild.html deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/winbuild.html left in tree.
>Removing doc/todo.html
>CONFLICT (modify/delete): doc/smyrna/using.tex deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/smyrna/using.tex left in tree.
>Removing doc/smyrna/smyrna.tex
>Removing doc/smyrna/smyrna.pdf
>Removing doc/smyrna/intro.tex
>Removing doc/smyrna/gui.tex
>Removing doc/smyrna/figures/zoomout.png
>Removing doc/smyrna/figures/zoomin.png
>Removing doc/smyrna/figures/topfish.png
>Removing doc/smyrna/figures/smyrna.png
>Removing doc/smyrna/figures/pan.png
>Removing doc/smyrna/figures/nodelist.png
>Removing doc/smyrna/figures/no_fisheye.png
>Removing doc/smyrna/figures/magnifier.png
>Removing doc/smyrna/figures/labels.png
>Removing doc/smyrna/figures/gvpr.png
>Removing doc/smyrna/figures/graph.png
>Removing doc/smyrna/figures/general.png
>Removing doc/smyrna/figures/fisheye.png
>Removing doc/smyrna/figures/details.png
>Removing doc/smyrna/figures/center.png
>Removing doc/smyrna/figures/attr4.png
>Removing doc/smyrna/figures/attr3.png
>Removing doc/smyrna/figures/attr2.png
>Removing doc/smyrna/figures/attr1.png
>Removing doc/smyrna/figures/3D.png
>Removing doc/smyrna/figures/2D.png
>Removing doc/smyrna/controls.tex
>Removing doc/smyrna/attributes.tex
>Removing doc/smyrna/Makefile
>Removing doc/schema/attributes.xslt
>Removing doc/schema/attributes.xml
>Removing doc/schema/arguments.xml
>Removing doc/schema/Makefile.am
>Removing doc/pspdf.png
>Removing doc/oldlibguide.pdf
>Removing doc/odt/graphviz_plugins.pdf
>Removing doc/odt/graphviz_plugins.odt
>Removing doc/neatoguide.pdf
>Removing doc/neato/typeshar.dot
>Removing doc/neato/process.dot
>Removing doc/neato/neato.tex
>Removing doc/neato/jho.dot
>Removing doc/neato/inet.dot
>Removing doc/neato/fancy.dot
>Removing doc/neato/Makefile
>Removing doc/neato/G4_pinned.dot
>Removing doc/neato/G4_orig.dot
>Removing doc/neato/G4_lenwt.dot
>Removing doc/neato/ER.dot
>Removing doc/libguide/unconnect.tex
>Removing doc/libguide/types.tex
>Removing doc/libguide/samples.tex
>Removing doc/libguide/plugins.tex
>Removing doc/libguide/paths.tex
>Removing doc/libguide/overlap.tex
>Removing doc/libguide/libguide.tex
>Removing doc/libguide/libguide.pdf
>Removing doc/libguide/layouts.tex
>Removing doc/libguide/intro.tex
>Removing doc/libguide/graphdraw.bib
>Removing doc/libguide/drivers.tex
>Removing doc/libguide/codegen.tex
>Removing doc/libguide/build.tex
>Removing doc/libguide/basic.tex
>Removing doc/libguide/Makefile
>Removing doc/libgraph/sccmap.tex
>CONFLICT (modify/delete): doc/libgraph/sccmap.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/libgraph/sccmap.c left in tree.
>Removing doc/libgraph/lgrind.sty
>Removing doc/libgraph/agmemread.tex
>Removing doc/libgraph/agmemread.c
>Removing doc/libgraph/Makefile
>Removing doc/libgraph/Agraph.tex
>Removing doc/libgraph/Agraph.pdf
>CONFLICT (modify/delete): doc/leftyguide.pdf deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/leftyguide.pdf left in tree.
>Removing doc/lefty/tail.tex
>Removing doc/lefty/sectionc.tex
>Removing doc/lefty/sectionb.tex
>Removing doc/lefty/sectiona.tex
>Removing doc/lefty/section5.tex
>Removing doc/lefty/section4.tex
>CONFLICT (modify/delete): doc/lefty/section3.tex deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/lefty/section3.tex left in tree.
>Removing doc/lefty/section2.tex
>Removing doc/lefty/section1.tex
>Removing doc/lefty/secc.tex
>Removing doc/lefty/secb.tex
>Removing doc/lefty/seca.tex
>Removing doc/lefty/sec5.tex
>Removing doc/lefty/sec4.tex
>Removing doc/lefty/sec3.tex
>Removing doc/lefty/sec2.tex
>Removing doc/lefty/sec1.tex
>Removing doc/lefty/progs/progtri.tex
>Removing doc/lefty/progs/progboxui.tex
>Removing doc/lefty/progs/progboxedit.tex
>Removing doc/lefty/progs/progboxdsinitial.tex
>Removing doc/lefty/progs/progboxdsfinal.tex
>Removing doc/lefty/progs/progboxdraw.tex
>Removing doc/lefty/progs/progboxdops.tex
>Removing doc/lefty/progs/progbox.tex
>Removing doc/lefty/head.tex
>Removing doc/lefty/full.tex
>Removing doc/lefty/figs/train11.dot
>Removing doc/lefty/figs/lefty.ppm.gz
>Removing doc/lefty/figs/figtrib.lefty
>Removing doc/lefty/figs/figtria.lefty
>Removing doc/lefty/figs/figradixtree.lefty
>Removing doc/lefty/figs/figfractaltracec.lefty
>Removing doc/lefty/figs/figfractaltraceb.lefty
>Removing doc/lefty/figs/figfractaltracea.lefty
>Removing doc/lefty/figs/figfractaloneb.lefty
>Removing doc/lefty/figs/figfractalonea.lefty
>Removing doc/lefty/figs/figfractalmvb.lefty
>Removing doc/lefty/figs/figfractalmva.lefty
>Removing doc/lefty/figs/figdag.lefty
>Removing doc/lefty/figs/figboxinitial.lefty
>Removing doc/lefty/figs/figboxfinal.lefty
>Removing doc/lefty/figs/figbigtree.lefty
>Removing doc/lefty/figs/fig2tpb.lefty
>Removing doc/lefty/figs/fig2tpa.lefty
>Removing doc/lefty/figs/box.lefty
>Removing doc/lefty/figs/Makefile
>Removing doc/lefty/Makefile
>Removing doc/latex_suggestions.txt
>Removing doc/internal_todo.html
>CONFLICT (modify/delete): doc/infosrc/types deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/types left in tree.
>Removing doc/infosrc/tee.gv
>Removing doc/infosrc/sz.awk
>Removing doc/infosrc/svg.awk
>CONFLICT (modify/delete): doc/infosrc/shapes.3 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/shapes.3 left in tree.
>CONFLICT (modify/delete): doc/infosrc/shapes.2 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/shapes.2 left in tree.
>Removing doc/infosrc/shapes.1
>Removing doc/infosrc/shapelist
>Removing doc/infosrc/sdlshapes.dot
>Removing doc/infosrc/sdl.ps
>Removing doc/infosrc/round.dot
>Removing doc/infosrc/record.dot
>Removing doc/infosrc/ps_to_png.sh
>Removing doc/infosrc/ps_to_jpg.sh
>Removing doc/infosrc/plugins.png
>Removing doc/infosrc/plugins.gv
>CONFLICT (modify/delete): doc/infosrc/outputs deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/outputs left in tree.
>Removing doc/infosrc/output.2
>CONFLICT (modify/delete): doc/infosrc/output.1 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/output.1 left in tree.
>Removing doc/infosrc/nohead.dot
>Removing doc/infosrc/mrecord.dot
>Removing doc/infosrc/mktypes.sh
>Removing doc/infosrc/mktapers.sh
>Removing doc/infosrc/mkstyles.sh
>Removing doc/infosrc/mksplines.sh
>Removing doc/infosrc/mkshhtml.sh
>Removing doc/infosrc/mkshapes.sh
>CONFLICT (modify/delete): doc/infosrc/mkoutput.sh deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/mkoutput.sh left in tree.
>Removing doc/infosrc/mklang.y
>Removing doc/infosrc/mkgrads.sh
>Removing doc/infosrc/mkcolors.awk
>Removing doc/infosrc/mkattrs.sh
>Removing doc/infosrc/mkarrowtbl.sh
>Removing doc/infosrc/mkarrows.sh
>Removing doc/infosrc/lang.2
>Removing doc/infosrc/lang.1
>CONFLICT (modify/delete): doc/infosrc/html_grammar deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/html_grammar left in tree.
>Removing doc/infosrc/html4.gv
>Removing doc/infosrc/html3.gv
>Removing doc/infosrc/html2.gv
>Removing doc/infosrc/html1.dot
>Removing doc/infosrc/html.3
>CONFLICT (modify/delete): doc/infosrc/html.2 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/html.2 left in tree.
>Removing doc/infosrc/html.1
>Removing doc/infosrc/grammar
>Removing doc/infosrc/forward.dot
>Removing doc/infosrc/fixed.gv
>Removing doc/infosrc/fill.dot
>Removing doc/infosrc/eqn.png
>Removing doc/infosrc/eqn.gif
>Removing doc/infosrc/constraint.dot
>Removing doc/infosrc/command.html
>Removing doc/infosrc/colors.n
>Removing doc/infosrc/colors.1
>Removing doc/infosrc/colorlist.dot
>Removing doc/infosrc/brewer.awk
>Removing doc/infosrc/both.dot
>Removing doc/infosrc/back.dot
>Removing doc/infosrc/attrs.1
>CONFLICT (modify/delete): doc/infosrc/attrs deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/attrs left in tree.
>Removing doc/infosrc/arrows.2
>Removing doc/infosrc/arrows.1
>Removing doc/infosrc/arrow_grammar
>CONFLICT (rename/delete): doc/infosrc/Makefile deleted in Applied patch and renamed in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/infosrc/Makefile left in tree.
>Removing doc/info/utr.gif
>Removing doc/info/underline.gif
>Removing doc/info/tripleoctagon.gif
>Removing doc/info/triangle.gif
>Removing doc/info/trapezium.gif
>Removing doc/info/threepoverhang.gif
>Removing doc/info/terminator.gif
>Removing doc/info/tee.gif
>Removing doc/info/tab.gif
>Removing doc/info/star.gif
>Removing doc/info/square.gif
>Removing doc/info/spline_spline.png
>Removing doc/info/spline_polyline.png
>Removing doc/info/spline_ortho.png
>Removing doc/info/spline_none.png
>Removing doc/info/spline_line.png
>Removing doc/info/spline_curved.png
>Removing doc/info/signature.gif
>CONFLICT (modify/delete): doc/info/shapes.html deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/info/shapes.html left in tree.
>Removing doc/info/shapegen.tcl
>Removing doc/info/septagon.gif
>Removing doc/info/sdlshapes.png
>Removing doc/info/sdlshapes.jpg
>Removing doc/info/rpromoter.gif
>Removing doc/info/round.gif
>Removing doc/info/rnastab.gif
>Removing doc/info/ribosite.gif
>Removing doc/info/restrictionsite.gif
>Removing doc/info/rectangle.gif
>Removing doc/info/rect.gif
>Removing doc/info/record2.gif
>Removing doc/info/record.gif
>Removing doc/info/rarrow.gif
>Removing doc/info/proteinstab.gif
>Removing doc/info/proteasesite.gif
>Removing doc/info/promoter.gif
>Removing doc/info/primersite.gif
>Removing doc/info/polygon.gif
>Removing doc/info/point.gif
>Removing doc/info/plugins.png
>Removing doc/info/plaintext.gif
>Removing doc/info/plain.gif
>Removing doc/info/pentagon.gif
>Removing doc/info/parallelogram.gif
>Removing doc/info/oval.gif
>CONFLICT (modify/delete): doc/info/output.html deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/info/output.html left in tree.
>Removing doc/info/octagon.gif
>Removing doc/info/noverhang.gif
>Removing doc/info/note.gif
>Removing doc/info/normal_none.png
>Removing doc/info/normal_forward.png
>Removing doc/info/normal_both.png
>Removing doc/info/normal_back.png
>Removing doc/info/none_none.png
>Removing doc/info/none_forward.png
>Removing doc/info/none_both.png
>Removing doc/info/none_back.png
>Removing doc/info/none.gif
>Removing doc/info/nohead.gif
>Removing doc/info/n_wedged.png
>Removing doc/info/n_striped.png
>Removing doc/info/n_solid.png
>Removing doc/info/n_rounded.png
>Removing doc/info/n_filled.png
>Removing doc/info/n_dotted.png
>Removing doc/info/n_diagonals.png
>Removing doc/info/n_dashed.png
>Removing doc/info/n_bold.png
>Removing doc/info/mrecord.gif
>Removing doc/info/lpromoter.gif
>Removing doc/info/larrow.gif
>Removing doc/info/lang.html
>Removing doc/info/invtriangle.gif
>Removing doc/info/invtrapezium.gif
>Removing doc/info/invhouse.gif
>Removing doc/info/insulator.gif
>Removing doc/info/index.html
>Removing doc/info/html4.gv
>Removing doc/info/html4.gif
>Removing doc/info/html3.gv
>Removing doc/info/html3.gif
>Removing doc/info/html2.gv
>Removing doc/info/html2.gif
>Removing doc/info/html1.gif
>Removing doc/info/house.gif
>Removing doc/info/hexagon.gif
>Removing doc/info/g_wlin90.png
>Removing doc/info/g_wlin45.png
>Removing doc/info/g_wlin360.png
>Removing doc/info/g_wlin270.png
>Removing doc/info/g_wlin180.png
>Removing doc/info/g_wlin0.png
>Removing doc/info/g_rad90.png
>Removing doc/info/g_rad45.png
>Removing doc/info/g_rad360.png
>Removing doc/info/g_rad270.png
>Removing doc/info/g_rad180.png
>Removing doc/info/g_rad0.png
>Removing doc/info/g_lin90.png
>Removing doc/info/g_lin45.png
>Removing doc/info/g_lin360.png
>Removing doc/info/g_lin270.png
>Removing doc/info/g_lin180.png
>Removing doc/info/g_lin0.png
>Removing doc/info/forward.gif
>Removing doc/info/folder.gif
>Removing doc/info/fixed.gif
>Removing doc/info/fivepoverhang.gif
>Removing doc/info/fill.gif
>Removing doc/info/ellipse.gif
>Removing doc/info/egg.gif
>Removing doc/info/e_solid.png
>Removing doc/info/e_dotted.png
>Removing doc/info/e_dashed.png
>Removing doc/info/e_bold.png
>Removing doc/info/doubleoctagon.gif
>Removing doc/info/doublecircle.gif
>Removing doc/info/diamond.gif
>Removing doc/info/cylinder.gif
>Removing doc/info/constraint.gif
>Removing doc/info/component.gif
>Removing doc/info/command.html
>Removing doc/info/colors.html
>Removing doc/info/colorlist.gif
>Removing doc/info/circle.gif
>Removing doc/info/cds.gif
>Removing doc/info/c_striped.png
>Removing doc/info/c_solid.png
>Removing doc/info/c_rounded.png
>Removing doc/info/c_filled.png
>Removing doc/info/c_dotted.png
>Removing doc/info/c_dashed.png
>Removing doc/info/c_bold.png
>Removing doc/info/box3d.gif
>Removing doc/info/box.gif
>Removing doc/info/both.gif
>Removing doc/info/back.gif
>CONFLICT (modify/delete): doc/info/attrs.html deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/info/attrs.html left in tree.
>Removing doc/info/assembly.gif
>Removing doc/info/arrows.html
>Removing doc/info/arrowgen.tcl
>Removing doc/info/aa_vee.gif
>Removing doc/info/aa_tee.gif
>Removing doc/info/aa_rvee.gif
>Removing doc/info/aa_rtee.gif
>Removing doc/info/aa_rnormal.gif
>Removing doc/info/aa_rinv.gif
>Removing doc/info/aa_ricurve.gif
>Removing doc/info/aa_rdiamond.gif
>Removing doc/info/aa_rcurve.gif
>Removing doc/info/aa_rcrow.gif
>Removing doc/info/aa_rbox.gif
>Removing doc/info/aa_ornormal.gif
>Removing doc/info/aa_orinv.gif
>Removing doc/info/aa_ordiamond.gif
>Removing doc/info/aa_orbox.gif
>Removing doc/info/aa_onormal.gif
>Removing doc/info/aa_olnormal.gif
>Removing doc/info/aa_olinv.gif
>Removing doc/info/aa_oldiamond.gif
>Removing doc/info/aa_olbox.gif
>Removing doc/info/aa_oinv.gif
>Removing doc/info/aa_odot.gif
>Removing doc/info/aa_odiamond.gif
>Removing doc/info/aa_obox.gif
>Removing doc/info/aa_normal.gif
>Removing doc/info/aa_none.gif
>Removing doc/info/aa_lvee.gif
>Removing doc/info/aa_ltee.gif
>Removing doc/info/aa_lnormal.gif
>Removing doc/info/aa_linv.gif
>Removing doc/info/aa_licurve.gif
>Removing doc/info/aa_ldiamond.gif
>Removing doc/info/aa_lcurve.gif
>Removing doc/info/aa_lcrow.gif
>Removing doc/info/aa_lbox.gif
>Removing doc/info/aa_inv.gif
>Removing doc/info/aa_icurve.gif
>Removing doc/info/aa_dot.gif
>Removing doc/info/aa_diamond.gif
>Removing doc/info/aa_curve.gif
>Removing doc/info/aa_crow.gif
>Removing doc/info/aa_box.gif
>Removing doc/info/a_tee.gif
>Removing doc/info/a_open.gif
>Removing doc/info/a_odot.gif
>Removing doc/info/a_odiamond.gif
>Removing doc/info/a_obox.gif
>Removing doc/info/a_normal.gif
>Removing doc/info/a_none.gif
>Removing doc/info/a_nohead.gif
>Removing doc/info/a_nohead.dot
>Removing doc/info/a_lteeoldiamond.gif
>Removing doc/info/a_invodot.gif
>Removing doc/info/a_invempty.gif
>Removing doc/info/a_invdot.gif
>Removing doc/info/a_inv.gif
>Removing doc/info/a_icurve.gif
>Removing doc/info/a_halfopen.gif
>Removing doc/info/a_forward.gif
>Removing doc/info/a_forward.dot
>Removing doc/info/a_empty.gif
>Removing doc/info/a_ediamond.gif
>Removing doc/info/a_dot.gif
>Removing doc/info/a_diamond.gif
>Removing doc/info/a_curve.gif
>Removing doc/info/a_crow.gif
>Removing doc/info/a_box.gif
>Removing doc/info/Msquare.gif
>Removing doc/info/Mdiamond.gif
>Removing doc/info/Mcircle.gif
>Removing doc/info/Makefile.am
>Removing doc/index.html
>Removing doc/gdtclft.entities.example.png
>CONFLICT (modify/delete): doc/fontfaq.txt deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/fontfaq.txt left in tree.
>CONFLICT (modify/delete): doc/dottyguide.pdf deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/dottyguide.pdf left in tree.
>Removing doc/dotty/tail.tex
>Removing doc/dotty/sectionb.tex
>Removing doc/dotty/sectiona.tex
>Removing doc/dotty/section5.tex
>Removing doc/dotty/section4.tex
>Removing doc/dotty/section3.tex
>Removing doc/dotty/section2.tex
>Removing doc/dotty/section1.tex
>Removing doc/dotty/secb.tex
>Removing doc/dotty/seca.tex
>Removing doc/dotty/sec5.tex
>Removing doc/dotty/sec4.tex
>Removing doc/dotty/sec3.tex
>Removing doc/dotty/sec2.tex
>Removing doc/dotty/sec1.tex
>Removing doc/dotty/progs/progfa.tex
>Removing doc/dotty/head.tex
>Removing doc/dotty/full.tex
>Removing doc/dotty/figs/ldbx.ppm.gz
>Removing doc/dotty/figs/fa2.xwd.gz
>Removing doc/dotty/figs/fa1.xwd.gz
>Removing doc/dotty/figs/dotty.xwd.gz
>Removing doc/dotty/figs/d8.xwd.gz
>Removing doc/dotty/figs/d7.xwd.gz
>Removing doc/dotty/figs/d6.xwd.gz
>Removing doc/dotty/figs/d5.xwd.gz
>Removing doc/dotty/figs/d4.xwd.gz
>Removing doc/dotty/figs/d3.xwd.gz
>Removing doc/dotty/figs/d2.xwd.gz
>Removing doc/dotty/figs/d1.xwd.gz
>Removing doc/dotty/figs/Makefile
>Removing doc/dotty/Makefile
>Removing doc/dotguide/vee.dot
>Removing doc/dotguide/tripleoctagon.dot
>Removing doc/dotguide/triangle.dot
>Removing doc/dotguide/tree.dot
>Removing doc/dotguide/trapezium.dot
>Removing doc/dotguide/tmsize10.clo
>Removing doc/dotguide/tee.dot
>Removing doc/dotguide/structs.dot
>Removing doc/dotguide/smlred.dot
>Removing doc/dotguide/recordex.dot
>Removing doc/dotguide/record.dot
>Removing doc/dotguide/polygon.dot
>Removing doc/dotguide/poly.dot
>Removing doc/dotguide/point.dot
>Removing doc/dotguide/plaintext.dot
>Removing doc/dotguide/parallelogram.dot
>Removing doc/dotguide/oinvdot.dot
>Removing doc/dotguide/odot.dot
>Removing doc/dotguide/octagon.dot
>Removing doc/dotguide/normal.dot
>Removing doc/dotguide/none.dot
>Removing doc/dotguide/no_arrow.dot
>Removing doc/dotguide/ndotguide.tex
>Removing doc/dotguide/invtriangle.dot
>Removing doc/dotguide/invtrapezium.dot
>Removing doc/dotguide/invodot.dot
>Removing doc/dotguide/invhouse.dot
>Removing doc/dotguide/invdot.dot
>Removing doc/dotguide/inv.dot
>Removing doc/dotguide/icurve.dot
>Removing doc/dotguide/html.dot
>Removing doc/dotguide/house.dot
>Removing doc/dotguide/hexagon.dot
>Removing doc/dotguide/hashtable.dot
>CONFLICT (modify/delete): doc/dotguide/graphdraw.bib deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/dotguide/graphdraw.bib left in tree.
>Removing doc/dotguide/graph2.dot
>Removing doc/dotguide/graph1.dot
>Removing doc/dotguide/fsm.dot
>Removing doc/dotguide/ellipse.dot
>Removing doc/dotguide/egg.dot
>Removing doc/dotguide/doubleoctagon.dot
>Removing doc/dotguide/doublecircle.dot
>Removing doc/dotguide/dotguide.tex
>Removing doc/dotguide/dot.dot
>Removing doc/dotguide/diamondarrow.dot
>Removing doc/dotguide/diamond.dot
>Removing doc/dotguide/curve.dot
>Removing doc/dotguide/crow.dot
>Removing doc/dotguide/constraint.dot
>Removing doc/dotguide/compound.dot
>Removing doc/dotguide/color_list
>Removing doc/dotguide/clust2.dot
>Removing doc/dotguide/clust1.dot
>Removing doc/dotguide/circle.dot
>Removing doc/dotguide/boxarrow.dot
>Removing doc/dotguide/box.dot
>Removing doc/dotguide/asde91.dot
>Removing doc/dotguide/Msquare.dot
>Removing doc/dotguide/Mrecord.dot
>Removing doc/dotguide/Mdiamond.dot
>Removing doc/dotguide/Mcircle.dot
>Removing doc/dotguide/Makefile
>Removing doc/dotguide.pdf
>Removing doc/docbook/src/imgs/hello_gd.png
>Removing doc/docbook/src/imgs/hello_cairo.png
>Removing doc/docbook/src/imgs/framework.svg
>Removing doc/docbook/src/imgs/framework.png
>Removing doc/docbook/src/imgs/Txlib.png
>Removing doc/docbook/src/graphviz_scripting.xml
>CONFLICT (modify/delete): doc/docbook/src/graphviz_plugins.xml deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/docbook/src/graphviz_plugins.xml left in tree.
>Removing doc/docbook/src/bookinfo.xml
>Removing doc/docbook/src/book.xml
>Removing doc/docbook/Makefile
>Removing doc/char.html
>CONFLICT (modify/delete): doc/build.html deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/build.html left in tree.
>Removing doc/addingLayout.txt
>Removing doc/Makefile.am
>CONFLICT (modify/delete): doc/FAQ.html deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/FAQ.html left in tree.
>CONFLICT (modify/delete): doc/Dot.ref deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of doc/Dot.ref left in tree.
>Removing debian/watch.in
>Removing debian/rules
>Removing debian/pyversions
>Removing debian/patches/series
>Removing debian/libgv-tcl.install
>Removing debian/libgv-ruby.install
>Removing debian/libgv-python.install
>Removing debian/libgv-php5.install
>Removing debian/libgv-perl.install
>Removing debian/libgv-ocaml.install
>Removing debian/libgv-lua.install
>Removing debian/libgv-guile.install
>Removing debian/libgraphviz4.postrm
>Removing debian/libgraphviz4.postinst
>Removing debian/libgraphviz4.lintian-overrides
>Removing debian/libgraphviz4.install
>Removing debian/libgraphviz-dev.install
>Removing debian/libgraphviz-config-update.pod.in
>Removing debian/graphviz.menu
>Removing debian/graphviz.install
>Removing debian/graphviz-doc.install
>Removing debian/graphviz-doc.doc-base
>Removing debian/copyright
>Removing debian/control
>Removing debian/compat
>Removing debian/changelog.in
>Removing debian/TODO
>Removing debian/README.source
>Removing debian/README.Debian-packaging
>Removing debian/README.Debian
>Removing contrib/webdot.cgi
>Removing contrib/sdlshapes/sdlshapes.dot
>Removing contrib/sdlshapes/sdl.ps
>Removing contrib/sdlshapes/README
>Removing contrib/prune/test.gv
>CONFLICT (modify/delete): contrib/prune/prune.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/prune/prune.c left in tree.
>Removing contrib/prune/prune.1
>CONFLICT (modify/delete): contrib/prune/generic_list.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/prune/generic_list.h left in tree.
>CONFLICT (modify/delete): contrib/prune/generic_list.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/prune/generic_list.c left in tree.
>Removing contrib/prune/README
>CONFLICT (modify/delete): contrib/prune/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/prune/Makefile.am left in tree.
>Removing contrib/pangotest/pangotest.c
>Removing contrib/pangotest/Makefile
>Removing contrib/lefty-grace/dotty_ui.lefty
>Removing contrib/lefty-grace/dotty_edit.lefty
>Removing contrib/lefty-grace/dotty_draw.lefty
>Removing contrib/lefty-grace/dotty.lefty
>CONFLICT (modify/delete): contrib/lefty-grace/README deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/lefty-grace/README left in tree.
>Removing contrib/java-dot/uml.dot
>Removing contrib/java-dot/sample.dot-orig
>Removing contrib/java-dot/license.txt
>Removing contrib/java-dot/example/SimpleGraph.java
>Removing contrib/java-dot/dot/DotStringAttr.java
>Removing contrib/java-dot/dot/DotNodeAttr.java
>Removing contrib/java-dot/dot/DotNode.java
>Removing contrib/java-dot/dot/DotLabelAttr.java
>Removing contrib/java-dot/dot/DotGraphSizeAttr.java
>Removing contrib/java-dot/dot/DotGraphRotateAttr.java
>Removing contrib/java-dot/dot/DotGraphAttr.java
>Removing contrib/java-dot/dot/DotGraph.java
>Removing contrib/java-dot/dot/DotEdgeAttr.java
>Removing contrib/java-dot/dot/DotEdge.java
>Removing contrib/java-dot/dot/DotCommentedAttr.java
>Removing contrib/java-dot/dot/DotColorAttr.java
>Removing contrib/java-dot/dot/DotCluster.java
>Removing contrib/java-dot/dot/DotAttributes.java
>Removing contrib/java-dot/dot/DotAttrValues.java
>Removing contrib/java-dot/dot/DotAttrNames.java
>Removing contrib/java-dot/dot/DotAttr.java
>Removing contrib/gprof2dot.awk
>Removing contrib/dotmcl.pl
>CONFLICT (modify/delete): contrib/dirgraph/named.dot deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/dirgraph/named.dot left in tree.
>Removing contrib/dirgraph/linux.dot
>CONFLICT (modify/delete): contrib/dirgraph/dirgraph.pl deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/dirgraph/dirgraph.pl left in tree.
>CONFLICT (modify/delete): contrib/dirgraph/bsdkernel.dot deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/dirgraph/bsdkernel.dot left in tree.
>CONFLICT (modify/delete): contrib/dirgraph/bsdarch.dot deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/dirgraph/bsdarch.dot left in tree.
>CONFLICT (modify/delete): contrib/dirgraph/apache.dot deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/dirgraph/apache.dot left in tree.
>Removing contrib/dirgraph/README
>CONFLICT (modify/delete): contrib/diffimg/diffimg.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/diffimg/diffimg.c left in tree.
>Removing contrib/diffimg/diffimg.1
>CONFLICT (modify/delete): contrib/diffimg/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/diffimg/Makefile.am left in tree.
>CONFLICT (modify/delete): contrib/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of contrib/Makefile.am left in tree.
>Removing contrib/INDEX
>Auto-merging configure.ac
>CONFLICT (content): Merge conflict in configure.ac
>Removing config/config_tcl.tcl
>Removing config/config_ruby.rb
>CONFLICT (modify/delete): config/config_python.py deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of config/config_python.py left in tree.
>Removing config/config_perl.pl
>Removing config/config.rpath
>CONFLICT (modify/delete): cmd/tools/unflatten.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/unflatten.c left in tree.
>Removing cmd/tools/unflatten.1
>CONFLICT (modify/delete): cmd/tools/tred.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/tred.c left in tree.
>CONFLICT (modify/delete): cmd/tools/tred.1 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/tred.1 left in tree.
>CONFLICT (modify/delete): cmd/tools/sccmap.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/sccmap.c left in tree.
>Removing cmd/tools/sccmap.1
>CONFLICT (modify/delete): cmd/tools/nop.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/nop.c left in tree.
>Removing cmd/tools/nop.1
>Removing cmd/tools/mmio.h
>Removing cmd/tools/mmio.c
>CONFLICT (modify/delete): cmd/tools/mm2gv.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/mm2gv.c left in tree.
>Removing cmd/tools/mm2gv.1
>Removing cmd/tools/matrix_market.h
>Removing cmd/tools/matrix_market.c
>CONFLICT (modify/delete): cmd/tools/gxl2gv.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gxl2gv.c left in tree.
>Removing cmd/tools/gxl2gv.1
>CONFLICT (modify/delete): cmd/tools/gvpack_builtins.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gvpack_builtins.c left in tree.
>CONFLICT (modify/delete): cmd/tools/gvpack.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gvpack.c left in tree.
>Removing cmd/tools/gvpack.1
>CONFLICT (modify/delete): cmd/tools/gvgen.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gvgen.c left in tree.
>CONFLICT (modify/delete): cmd/tools/gvgen.1 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gvgen.1 left in tree.
>CONFLICT (modify/delete): cmd/tools/gvcolor.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gvcolor.c left in tree.
>Removing cmd/tools/gvcolor.1
>Removing cmd/tools/gv2gxl.c
>CONFLICT (modify/delete): cmd/tools/gv2gml.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gv2gml.c left in tree.
>CONFLICT (modify/delete): cmd/tools/graphml2gv.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/graphml2gv.c left in tree.
>Removing cmd/tools/graphml2gv.1
>Removing cmd/tools/graph_generator.h
>CONFLICT (modify/delete): cmd/tools/graph_generator.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/graph_generator.c left in tree.
>CONFLICT (modify/delete): cmd/tools/gmlscan.l deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gmlscan.l left in tree.
>CONFLICT (modify/delete): cmd/tools/gmlparse.y deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gmlparse.y left in tree.
>Removing cmd/tools/gml2gv.sln
>Removing cmd/tools/gml2gv.ncb
>CONFLICT (modify/delete): cmd/tools/gml2gv.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gml2gv.h left in tree.
>CONFLICT (modify/delete): cmd/tools/gml2gv.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gml2gv.c left in tree.
>Removing cmd/tools/gml2gv.1
>CONFLICT (modify/delete): cmd/tools/gc.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/gc.c left in tree.
>Removing cmd/tools/gc.1
>CONFLICT (modify/delete): cmd/tools/dijkstra.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/dijkstra.c left in tree.
>Removing cmd/tools/dijkstra.1
>CONFLICT (modify/delete): cmd/tools/cvtgxl.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/cvtgxl.c left in tree.
>CONFLICT (modify/delete): cmd/tools/convert.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/convert.h left in tree.
>Removing cmd/tools/colxlate.c
>Removing cmd/tools/colortbl.h
>CONFLICT (modify/delete): cmd/tools/ccomps.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/ccomps.c left in tree.
>Removing cmd/tools/ccomps.1
>CONFLICT (modify/delete): cmd/tools/bcomps.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/bcomps.c left in tree.
>Removing cmd/tools/bcomps.1
>CONFLICT (modify/delete): cmd/tools/acyclic.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/acyclic.c left in tree.
>Removing cmd/tools/acyclic.1
>CONFLICT (modify/delete): cmd/tools/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/tools/Makefile.am left in tree.
>Removing cmd/smyrna/viewportcamera.h
>Removing cmd/smyrna/viewportcamera.c
>CONFLICT (modify/delete): cmd/smyrna/viewport.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/viewport.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/viewport.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/viewport.c left in tree.
>CONFLICT (modify/delete): cmd/smyrna/tvnodes.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/tvnodes.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/tvnodes.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/tvnodes.c left in tree.
>CONFLICT (modify/delete): cmd/smyrna/trackball.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/trackball.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/trackball.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/trackball.c left in tree.
>Removing cmd/smyrna/topviewfuncs.h
>Removing cmd/smyrna/topviewfuncs.c
>Removing cmd/smyrna/topviewdefs.h
>Removing cmd/smyrna/topviewdata.h
>Removing cmd/smyrna/topviewdata.c
>Removing cmd/smyrna/topfisheyeview.h
>CONFLICT (modify/delete): cmd/smyrna/topfisheyeview.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/topfisheyeview.c left in tree.
>CONFLICT (modify/delete): cmd/smyrna/support.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/support.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/support.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/support.c left in tree.
>CONFLICT (modify/delete): cmd/smyrna/smyrnadefs.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/smyrnadefs.h left in tree.
>Removing cmd/smyrna/smyrna_utils.h
>Removing cmd/smyrna/smyrna_utils.c
>Removing cmd/smyrna/smyrna.1
>Removing cmd/smyrna/selectionfuncs.h
>Removing cmd/smyrna/selectionfuncs.c
>Removing cmd/smyrna/punchlist.txt
>Removing cmd/smyrna/polytess.h
>CONFLICT (modify/delete): cmd/smyrna/polytess.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/polytess.c left in tree.
>Removing cmd/smyrna/md5.h
>Removing cmd/smyrna/md5.c
>CONFLICT (modify/delete): cmd/smyrna/materials.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/materials.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/main.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/main.c left in tree.
>Removing cmd/smyrna/leopard_osx_hack
>Removing cmd/smyrna/hotkeymap.h
>Removing cmd/smyrna/hotkeymap.c
>Removing cmd/smyrna/hier.h
>Removing cmd/smyrna/hier.c
>Removing cmd/smyrna/gvprpipe.h
>Removing cmd/smyrna/gvprpipe.c
>Removing cmd/smyrna/gui/topviewsettings.h
>Removing cmd/smyrna/gui/topviewsettings.c
>CONFLICT (modify/delete): cmd/smyrna/gui/toolboxcallbacks.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/toolboxcallbacks.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/gui/toolboxcallbacks.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/toolboxcallbacks.c left in tree.
>Removing cmd/smyrna/gui/smyrna.glade
>CONFLICT (modify/delete): cmd/smyrna/gui/menucallbacks.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/menucallbacks.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/gui/menucallbacks.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/menucallbacks.c left in tree.
>Removing cmd/smyrna/gui/gui.h
>CONFLICT (modify/delete): cmd/smyrna/gui/gui.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/gui.c left in tree.
>Removing cmd/smyrna/gui/glcompui.h
>CONFLICT (modify/delete): cmd/smyrna/gui/glcompui.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/glcompui.c left in tree.
>Removing cmd/smyrna/gui/frmobjectui.h
>CONFLICT (modify/delete): cmd/smyrna/gui/frmobjectui.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/frmobjectui.c left in tree.
>Removing cmd/smyrna/gui/filterscallbacks.h
>CONFLICT (modify/delete): cmd/smyrna/gui/datalistcallbacks.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/datalistcallbacks.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/gui/datalistcallbacks.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/datalistcallbacks.c left in tree.
>CONFLICT (modify/delete): cmd/smyrna/gui/callbacks.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/callbacks.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/gui/callbacks.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gui/callbacks.c left in tree.
>Removing cmd/smyrna/gui/appmouse.h
>Removing cmd/smyrna/gui/appmouse.c
>Removing cmd/smyrna/glutrender.h
>Removing cmd/smyrna/glutrender.c
>CONFLICT (modify/delete): cmd/smyrna/gltemplate.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gltemplate.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/gltemplate.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/gltemplate.c left in tree.
>Removing cmd/smyrna/glmotion.h
>Removing cmd/smyrna/glmotion.c
>Removing cmd/smyrna/glexpose.h
>Removing cmd/smyrna/glexpose.c
>Removing cmd/smyrna/filter.h
>Removing cmd/smyrna/filter.c
>Removing cmd/smyrna/drawxdot.h
>CONFLICT (modify/delete): cmd/smyrna/draw.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/draw.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/draw.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/draw.c left in tree.
>CONFLICT (modify/delete): cmd/smyrna/btree.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/btree.h left in tree.
>CONFLICT (modify/delete): cmd/smyrna/btree.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/btree.c left in tree.
>Removing cmd/smyrna/arcball.h
>Removing cmd/smyrna/arcball.c
>Removing cmd/smyrna/TODO
>CONFLICT (modify/delete): cmd/smyrna/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/smyrna/Makefile.am left in tree.
>CONFLICT (modify/delete): cmd/mingle/minglemain.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/mingle/minglemain.c left in tree.
>Removing cmd/mingle/mingle.1
>CONFLICT (modify/delete): cmd/mingle/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/mingle/Makefile.am left in tree.
>CONFLICT (modify/delete): cmd/lneato/mswin32/lneato.mak deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lneato/mswin32/lneato.mak left in tree.
>Removing cmd/lneato/mswin32/lneato.c
>Removing cmd/lneato/mswin32/doinst
>Removing cmd/lneato/lneato.sh
>Removing cmd/lneato/lneato.ksh
>Removing cmd/lneato/lneato.bsh
>Removing cmd/lneato/lneato.1
>CONFLICT (modify/delete): cmd/lneato/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lneato/Makefile.am left in tree.
>Removing cmd/lefty/ws/x11/libfilereq/xstat.h
>CONFLICT (modify/delete): cmd/lefty/ws/x11/libfilereq/SelFile.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/ws/x11/libfilereq/SelFile.c left in tree.
>Removing cmd/lefty/ws/x11/libfilereq/SFinternal.h
>Removing cmd/lefty/ws/x11/libfilereq/SFDecls.h
>Removing cmd/lefty/ws/x11/libfilereq/SF.h
>Removing cmd/lefty/ws/x11/libfilereq/README.selfile
>CONFLICT (modify/delete): cmd/lefty/ws/x11/libfilereq/Path.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/ws/x11/libfilereq/Path.c left in tree.
>Removing cmd/lefty/ws/x11/libfilereq/Makefile.am
>CONFLICT (modify/delete): cmd/lefty/ws/x11/libfilereq/Draw.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/ws/x11/libfilereq/Draw.c left in tree.
>CONFLICT (modify/delete): cmd/lefty/ws/x11/libfilereq/Dir.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/ws/x11/libfilereq/Dir.c left in tree.
>Removing cmd/lefty/ws/x11/gview.c
>Removing cmd/lefty/ws/x11/gtext.c
>Removing cmd/lefty/ws/x11/gscroll.c
>CONFLICT (modify/delete): cmd/lefty/ws/x11/gquery.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/ws/x11/gquery.c left in tree.
>Removing cmd/lefty/ws/x11/gpcanvas.c
>Removing cmd/lefty/ws/x11/gmenu.c
>Removing cmd/lefty/ws/x11/glabel.c
>Removing cmd/lefty/ws/x11/gcommon.h
>Removing cmd/lefty/ws/x11/gcommon.c
>Removing cmd/lefty/ws/x11/gcanvas.c
>Removing cmd/lefty/ws/x11/gbutton.c
>Removing cmd/lefty/ws/x11/garray.c
>Removing cmd/lefty/ws/x11/Makefile.am
>Removing cmd/lefty/ws/none/gview.c
>Removing cmd/lefty/ws/none/gtext.c
>Removing cmd/lefty/ws/none/gscroll.c
>Removing cmd/lefty/ws/none/gquery.c
>Removing cmd/lefty/ws/none/gpcanvas.c
>Removing cmd/lefty/ws/none/gmenu.c
>Removing cmd/lefty/ws/none/glabel.c
>Removing cmd/lefty/ws/none/gcommon.h
>Removing cmd/lefty/ws/none/gcommon.c
>Removing cmd/lefty/ws/none/gcanvas.c
>Removing cmd/lefty/ws/none/gbutton.c
>Removing cmd/lefty/ws/none/garray.c
>Removing cmd/lefty/ws/mswin32/resource.h
>Removing cmd/lefty/ws/mswin32/lefty.rc
>Removing cmd/lefty/ws/mswin32/gview.c
>Removing cmd/lefty/ws/mswin32/gtext.c
>Removing cmd/lefty/ws/mswin32/gscroll.c
>Removing cmd/lefty/ws/mswin32/gquery.c
>Removing cmd/lefty/ws/mswin32/gpcanvas.c
>Removing cmd/lefty/ws/mswin32/gmenu.c
>Removing cmd/lefty/ws/mswin32/glabel.c
>Removing cmd/lefty/ws/mswin32/gcommon.h
>Removing cmd/lefty/ws/mswin32/gcommon.c
>Removing cmd/lefty/ws/mswin32/gcanvas.c
>Removing cmd/lefty/ws/mswin32/gbutton.c
>Removing cmd/lefty/ws/mswin32/garray.c
>Removing cmd/lefty/ws/mswin32/Makefile.am
>Removing cmd/lefty/ws/gtk/gview.c
>Removing cmd/lefty/ws/gtk/gtext.c
>Removing cmd/lefty/ws/gtk/gscroll.c
>Removing cmd/lefty/ws/gtk/gquery.c
>Removing cmd/lefty/ws/gtk/gpcanvas.c
>Removing cmd/lefty/ws/gtk/gmenu.c
>Removing cmd/lefty/ws/gtk/glabel.c
>Removing cmd/lefty/ws/gtk/gcommon.h
>Removing cmd/lefty/ws/gtk/gcommon.c
>Removing cmd/lefty/ws/gtk/gcanvas.c
>Removing cmd/lefty/ws/gtk/gbutton.c
>Removing cmd/lefty/ws/gtk/garray.c
>Removing cmd/lefty/ws/Makefile.am
>Removing cmd/lefty/txtview.h
>CONFLICT (modify/delete): cmd/lefty/txtview.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/txtview.c left in tree.
>CONFLICT (modify/delete): cmd/lefty/tbl.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/tbl.h left in tree.
>CONFLICT (modify/delete): cmd/lefty/tbl.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/tbl.c left in tree.
>Removing cmd/lefty/str.h
>Removing cmd/lefty/str.c
>Removing cmd/lefty/parse.h
>Removing cmd/lefty/parse.c
>Removing cmd/lefty/os/unix/io.c
>Removing cmd/lefty/os/unix/Makefile.am
>CONFLICT (modify/delete): cmd/lefty/os/mswin32/lefty.mak deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/os/mswin32/lefty.mak left in tree.
>Removing cmd/lefty/os/mswin32/io.c
>Removing cmd/lefty/os/mswin32/doinst
>Removing cmd/lefty/os/mswin32/Makefile.am
>Removing cmd/lefty/os/Makefile.am
>Removing cmd/lefty/mem.h
>Removing cmd/lefty/mem.c
>Removing cmd/lefty/lex.h
>Removing cmd/lefty/lex.c
>Removing cmd/lefty/leftyio.h
>Removing cmd/lefty/lefty.psp
>CONFLICT (modify/delete): cmd/lefty/lefty.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/lefty.c left in tree.
>Removing cmd/lefty/lefty.1
>Removing cmd/lefty/internal.h
>CONFLICT (modify/delete): cmd/lefty/internal.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/internal.c left in tree.
>Removing cmd/lefty/gfxview.h
>CONFLICT (modify/delete): cmd/lefty/gfxview.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/gfxview.c left in tree.
>CONFLICT (modify/delete): cmd/lefty/g.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/g.h left in tree.
>CONFLICT (modify/delete): cmd/lefty/g.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/g.c left in tree.
>Removing cmd/lefty/exec.h
>Removing cmd/lefty/exec.c
>Removing cmd/lefty/examples/tree.lefty
>Removing cmd/lefty/examples/slides.lefty
>Removing cmd/lefty/examples/fractal2.lefty
>Removing cmd/lefty/examples/fractal.lefty
>Removing cmd/lefty/examples/def.lefty
>Removing cmd/lefty/examples/box.lefty
>Removing cmd/lefty/examples/Makefile.am
>Removing cmd/lefty/dot2l/triefa.h
>Removing cmd/lefty/dot2l/triefa.c
>Removing cmd/lefty/dot2l/dottrie.c
>CONFLICT (modify/delete): cmd/lefty/dot2l/dotparse.y deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/dot2l/dotparse.y left in tree.
>Removing cmd/lefty/dot2l/dotlex.c
>Removing cmd/lefty/dot2l/dot2l.h
>Removing cmd/lefty/dot2l/dot2l.c
>Removing cmd/lefty/dot2l/Makefile.am
>Removing cmd/lefty/display.h
>Removing cmd/lefty/display.c
>Removing cmd/lefty/cs2l/cs2l.h
>Removing cmd/lefty/cs2l/cs2l.c
>CONFLICT (modify/delete): cmd/lefty/common.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/common.h left in tree.
>Removing cmd/lefty/common.c
>Removing cmd/lefty/colors.txt
>Removing cmd/lefty/code.h
>Removing cmd/lefty/code.c
>Removing cmd/lefty/aix_mods/tbl.c
>Removing cmd/lefty/aix_mods/exec.c
>CONFLICT (modify/delete): cmd/lefty/aix_mods/common.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/aix_mods/common.h left in tree.
>CONFLICT (modify/delete): cmd/lefty/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/lefty/Makefile.am left in tree.
>Removing cmd/lefty/LOG
>CONFLICT (modify/delete): cmd/gvedit/ui_settings.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/ui_settings.h left in tree.
>Removing cmd/gvedit/ui/settings.ui
>Removing cmd/gvedit/ui/main.ui
>Removing cmd/gvedit/ui/Makefile.am
>Removing cmd/gvedit/mdichild.h
>Removing cmd/gvedit/mdichild.cpp
>Removing cmd/gvedit/mdi.qrc
>Removing cmd/gvedit/mainwindow.h
>CONFLICT (modify/delete): cmd/gvedit/mainwindow.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/mainwindow.cpp left in tree.
>CONFLICT (modify/delete): cmd/gvedit/main.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/main.cpp left in tree.
>Removing cmd/gvedit/imageviewer.h
>Removing cmd/gvedit/imageviewer.cpp
>Removing cmd/gvedit/images/settings.png
>Removing cmd/gvedit/images/save_as.png
>Removing cmd/gvedit/images/save.png
>Removing cmd/gvedit/images/run.png
>Removing cmd/gvedit/images/paste.png
>Removing cmd/gvedit/images/open.png
>Removing cmd/gvedit/images/new.png
>Removing cmd/gvedit/images/icon.png
>Removing cmd/gvedit/images/export.png
>Removing cmd/gvedit/images/cut.png
>Removing cmd/gvedit/images/copy.png
>Removing cmd/gvedit/images/Makefile.am
>CONFLICT (modify/delete): cmd/gvedit/gvedit.pro.ms deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/gvedit.pro.ms left in tree.
>CONFLICT (modify/delete): cmd/gvedit/gvedit.pro.in deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/gvedit.pro.in left in tree.
>Removing cmd/gvedit/gvedit.1
>CONFLICT (modify/delete): cmd/gvedit/csettings.h deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/csettings.h left in tree.
>CONFLICT (modify/delete): cmd/gvedit/csettings.cpp deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/csettings.cpp left in tree.
>CONFLICT (modify/delete): cmd/gvedit/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/gvedit/Makefile.am left in tree.
>CONFLICT (modify/delete): cmd/edgepaint/edgepaintmain.c deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/edgepaint/edgepaintmain.c left in tree.
>CONFLICT (modify/delete): cmd/edgepaint/edgepaint.1 deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/edgepaint/edgepaint.1 left in tree.
>CONFLICT (modify/delete): cmd/edgepaint/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/edgepaint/Makefile.am left in tree.
>Removing cmd/dotty/notes
>CONFLICT (modify/delete): cmd/dotty/mswin32/dotty.mak deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/dotty/mswin32/dotty.mak left in tree.
>Removing cmd/dotty/mswin32/dotty.c
>Removing cmd/dotty/mswin32/doinst
>Removing cmd/dotty/dotty_ui.lefty
>Removing cmd/dotty/dotty_layout.lefty
>Removing cmd/dotty/dotty_edit.lefty
>Removing cmd/dotty/dotty_draw.lefty
>Removing cmd/dotty/dotty.sh
>Removing cmd/dotty/dotty.lefty
>Removing cmd/dotty/dotty.ksh
>Removing cmd/dotty/dotty.bsh
>Removing cmd/dotty/dotty.1
>CONFLICT (modify/delete): cmd/dotty/Makefile.am deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of cmd/dotty/Makefile.am left in tree.
>Removing cmd/dot/cmap_tester.tcl
>CONFLICT (modify/delete): appveyor.yml deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of appveyor.yml left in tree.
>Auto-merging Makefile.am
>CONFLICT (content): Merge conflict in Makefile.am
>CONFLICT (modify/delete): Doxyfile.in deleted in Applied patch and modified in bd97cff688f7a7b85b6f1262e14eb1cac0862fcd. Version bd97cff688f7a7b85b6f1262e14eb1cac0862fcd of Doxyfile.in left in tree.
>error: Failed to merge in the changes.
>Patch failed at 0001 Applied patch
>The copy of the patch that failed is found in: .git/rebase-apply/patch
>
>When you have resolved this problem, run "git rebase --continue".
>If you prefer to skip this patch, run "git rebase --skip" instead.
>To check out the original branch and stop rebasing, run "git rebase --abort".

Actions: View

Attachments on bug 491098: 272240 | 272683