This patch is failing against r6957. Here is the patch error: patching file common/geometry/hetriang.cpp Hunk #1 FAILED at 45. 1 out of 3 hunks FAILED -- saving rejects to file common/geometry/hetriang.cpp.rej
The rest of the patch applies cleanly. On 6/29/2016 1:39 PM, Simon Richter wrote: > --- > common/config_params.cpp | 10 ++--- > common/dialogs/wx_html_report_panel.cpp | 6 +-- > common/draw_panel_gal.cpp | 7 ++-- > common/footprint_info.cpp | 2 +- > common/geometry/hetriang.cpp | 6 +-- > common/geometry/shape_poly_set.cpp | 26 ++++++------ > common/tool/action_manager.cpp | 11 +++-- > common/tool/tool_dispatcher.cpp | 5 +-- > common/tool/tool_event.cpp | 3 +- > common/tool/tool_manager.cpp | 11 +++-- > common/view/view.cpp | 13 +++--- > common/view/view_group.cpp | 5 +-- > common/worksheet_viewitem.cpp | 3 +- > eeschema/autoplace_fields.cpp | 23 ++++++----- > eeschema/class_libentry.cpp | 47 > +++++++++++----------- > eeschema/class_library.cpp | 12 +++--- > eeschema/component_references_lister.cpp | 4 +- > eeschema/component_tree_search_container.cpp | 19 +++++---- > eeschema/dialogs/dialog_rescue_each.cpp | 5 +-- > eeschema/find.cpp | 2 - > eeschema/getpart.cpp | 4 +- > eeschema/lib_polyline.cpp | 4 +- > eeschema/libedit_plot_component.cpp | 2 - > eeschema/libeditframe.cpp | 4 +- > eeschema/netlist.cpp | 1 - > eeschema/project_rescue.cpp | 21 +++++----- > eeschema/sch_bus_entry.cpp | 3 +- > eeschema/sch_component.cpp | 7 ++-- > eeschema/sch_line.cpp | 4 +- > eeschema/sch_screen.cpp | 3 +- > eeschema/sch_sheet.cpp | 32 +++++++-------- > eeschema/sch_sheet.h | 3 +- > eeschema/sch_sheet_path.cpp | 3 +- > eeschema/symbedit.cpp | 6 +-- > include/footprint_info.h | 1 - > pcbnew/autorouter/spread_footprints.cpp | 5 +-- > pcbnew/class_pad.cpp | 3 +- > pcbnew/dialogs/dialog_update_pcb.cpp | 2 +- > pcbnew/modview_frame.cpp | 2 +- > pcbnew/netlist.cpp | 2 +- > pcbnew/ratsnest_data.cpp | 40 +++++++++--------- > pcbnew/ratsnest_data.h | 3 +- > pcbnew/ratsnest_viewitem.cpp | 5 +-- > pcbnew/router/length_tuner_tool.cpp | 1 - > pcbnew/router/pns_diff_pair.cpp | 14 +++---- > pcbnew/router/pns_diff_pair_placer.cpp | 3 +- > pcbnew/router/pns_dp_meander_placer.cpp | 13 +++--- > pcbnew/router/pns_dragger.cpp | 6 +-- > pcbnew/router/pns_index.h | 1 - > pcbnew/router/pns_itemset.cpp | 12 +++--- > pcbnew/router/pns_itemset.h | 5 +-- > pcbnew/router/pns_joint.h | 4 +- > pcbnew/router/pns_line.cpp | 11 +++-- > pcbnew/router/pns_line_placer.cpp | 9 ++--- > pcbnew/router/pns_meander.cpp | 4 +- > pcbnew/router/pns_meander_placer.cpp | 8 ++-- > pcbnew/router/pns_meander_placer_base.cpp | 6 +-- > pcbnew/router/pns_meander_skew_placer.cpp | 8 ++-- > pcbnew/router/pns_node.cpp | 34 ++++++++-------- > pcbnew/router/pns_optimizer.cpp | 10 ++--- > pcbnew/router/pns_router.cpp | 20 +++++---- > pcbnew/router/pns_shove.cpp | 24 +++++------ > pcbnew/router/pns_sizes_settings.cpp | 2 +- > pcbnew/router/pns_tool_base.cpp | 5 +-- > pcbnew/router/pns_topology.cpp | 14 +++---- > pcbnew/router/pns_walkaround.cpp | 1 - > pcbnew/router/router_tool.cpp | 1 - > pcbnew/tools/edit_points.cpp | 14 +++---- > pcbnew/tools/edit_tool.cpp | 5 +-- > pcbnew/tools/grid_helper.cpp | 5 +-- > pcbnew/tools/module_tools.cpp | 11 +++-- > pcbnew/tools/placement_tool.cpp | 5 +-- > pcbnew/tools/selection_tool.cpp | 13 +++--- > ...es_convert_brd_items_to_polygons_with_Boost.cpp | 2 - > 74 files changed, 284 insertions(+), 367 deletions(-) > > > > _______________________________________________ > Mailing list: https://launchpad.net/~kicad-developers > Post to : [email protected] > Unsubscribe : https://launchpad.net/~kicad-developers > More help : https://help.launchpad.net/ListHelp > _______________________________________________ Mailing list: https://launchpad.net/~kicad-developers Post to : [email protected] Unsubscribe : https://launchpad.net/~kicad-developers More help : https://help.launchpad.net/ListHelp
