← Back to branch summary

~ubuntu-branches/ubuntu/lucid/oregano/lucid-proposed

~ubuntu-branches/ubuntu/lucid/oregano/lucid-proposed

Viewing all changes in revision 6.

Committer: Bazaar Package Importer
Author(s): Bhavani Shankar
Date: 2009-07-25 14:44:58 UTC
mfrom: (4.1.1 sid)
Revision ID: james.westby@ubuntu.com-20090725144458-lruw9bu2cidtumsf

Tags: 0.69.1-1ubuntu1

https://launchpad.net/bugs/404477

https://launchpad.net/bugs/60777

* Merge from debian unstable, remaining changes: LP: #404477
  + Add debian/patches/line.drawing.dpatch:
    - When moving a wire so that it joins with another delete the moved
      wire, as well as extending the other. (LP: #60777)

files added:
._Changelog

data/models/SConscript-darcs-backup0

debian/patches/desktop.file.update.dpatch

debian/patches/scons.env.flags.dpatch

src/model/wire.c-darcs-backup0

src/schematic-view-menu.h

files removed:
debian/patches/desktop.update.dpatch

debian/patches/power.lib.mess.dpatch

debian/patches/scons.env.cflags.dpatch

debian/patches/scons.env.ldflags.dpatch

src/pspice2oregano.c

src/schematic-view-ui.h

files modified:
Changelog

README

SConstruct

data/SConscript

data/dialogs/view-netlist.glade2

data/libraries/power.oreglib

data/netlist.lang

debian/changelog

debian/control

debian/patches/00list

debian/patches/line.drawing.dpatch

oregano.spec.in

src/SConscript

src/clipboard.c

src/clipboard.h

src/create-wire.c

src/create-wire.h

src/cursors.c

src/cursors.h

src/dialogs.c

src/dialogs.h

src/engines/engine.c

src/engines/engine.h

src/engines/gnucap.c

src/engines/gnucap.h

src/engines/netlist.c

src/engines/netlist.h

src/engines/ngspice.c

src/engines/ngspice.h

src/errors.c

src/errors.h

src/file-manager.c

src/file-manager.h

src/file.c

src/file.h

src/gplot/gplot.c

src/gplot/gplot.h

src/gplot/gplotfunction.c

src/gplot/gplotfunction.h

src/gplot/gplotlines.c

src/gplot/gplotlines.h

src/load-common.h

src/load-library.c

src/load-library.h

src/load-schematic.c

src/load-schematic.h

src/main.c

src/main.h

src/model/item-data.c

src/model/item-data.h

src/model/node-store.c

src/model/node-store.h

src/model/node.c

src/model/node.h

src/model/part-label.h

src/model/part-private.h

src/model/part-property.c

src/model/part-property.h

src/model/part.c

src/model/part.h

src/model/schematic-print-context.h

src/model/schematic.c

src/model/schematic.h

src/model/sheet-pos.h

src/model/textbox.c

src/model/textbox.h

src/model/wire-private.h

src/model/wire.c

src/model/wire.h

src/netlist-editor.c

src/netlist-editor.h

src/oregano-config.c

src/oregano-config.h

src/oregano-convert *

src/oregano-impl.c

src/oregano-utils.c

src/oregano-utils.h

src/part-browser.c

src/part-browser.h

src/plot-add-function.c

src/plot-add-function.h

src/plot.c

src/plot.h

src/save-schematic.c

src/save-schematic.h

src/schematic-view.c

src/schematic-view.h

src/settings.c

src/settings.h

src/sheet/grid.c

src/sheet/grid.h

src/sheet/node-item.c

src/sheet/node-item.h

src/sheet/part-item.c

src/sheet/part-item.h

src/sheet/sheet-item-factory.c

src/sheet/sheet-item-factory.h

src/sheet/sheet-item.c

src/sheet/sheet-item.h

src/sheet/sheet-private.h

src/sheet/sheet.c

src/sheet/sheet.h

src/sheet/textbox-item.c

src/sheet/textbox-item.h

src/sheet/wire-item.c

src/sheet/wire-item.h

src/sim-settings.c

src/sim-settings.h

src/simulation.c

src/simulation.h

src/smallicon.c

src/smallicon.h

src/splash.c

src/splash.h

src/stock.c

src/stock.h

src/type-utils.h

src/xml-compat.h

src/xml-helper.c

src/xml-helper.h

tools/oregano-convert *

Show diffs side-by-side

added added

removed removed

data/SConscript

data/dialogs/view-netlist.glade2

data/libraries/power.oreglib

data/models/SConscript-darcs-backup0

data/netlist.lang

debian/changelog

debian/patches/00list

debian/patches/desktop.file.update.dpatch

debian/patches/desktop.update.dpatch

debian/patches/line.drawing.dpatch

debian/patches/power.lib.mess.dpatch

debian/patches/scons.env.cflags.dpatch

debian/patches/scons.env.flags.dpatch

debian/patches/scons.env.ldflags.dpatch

oregano.spec.in

src/clipboard.c

src/clipboard.h

src/create-wire.c

src/create-wire.h

src/engines/engine.c

src/engines/engine.h

src/engines/gnucap.c

src/engines/gnucap.h

src/engines/netlist.c

src/engines/netlist.h

src/engines/ngspice.c

src/engines/ngspice.h

src/file-manager.c

src/file-manager.h

src/gplot/gplot.c

src/gplot/gplot.h

src/gplot/gplotfunction.c

src/gplot/gplotfunction.h

src/gplot/gplotlines.c

src/gplot/gplotlines.h

src/load-common.h

src/load-library.c

src/load-library.h

src/load-schematic.c

src/load-schematic.h

src/model/item-data.c

src/model/item-data.h

src/model/node-store.c

src/model/node-store.h

src/model/node.c

src/model/node.h

src/model/part-label.h

src/model/part-private.h

src/model/part-property.c

src/model/part-property.h

src/model/part.c

src/model/part.h

src/model/schematic-print-context.h

src/model/schematic.c

src/model/schematic.h

src/model/sheet-pos.h

src/model/textbox.c

src/model/textbox.h

src/model/wire-private.h

src/model/wire.c

src/model/wire.c-darcs-backup0

src/model/wire.h

src/netlist-editor.c

src/netlist-editor.h

src/oregano-config.c

src/oregano-config.h

src/oregano-impl.c

src/oregano-utils.c

src/oregano-utils.h

src/part-browser.c

src/part-browser.h

src/plot-add-function.c

src/plot-add-function.h

src/pspice2oregano.c

src/save-schematic.c

src/save-schematic.h

src/schematic-view-ui.h

src/schematic-view.c

src/schematic-view.h

src/sheet/grid.c

src/sheet/grid.h

src/sheet/node-item.c

src/sheet/node-item.h

src/sheet/part-item.c

src/sheet/part-item.h

src/sheet/sheet-item-factory.c

src/sheet/sheet-item-factory.h

src/sheet/sheet-item.c

src/sheet/sheet-item.h

src/sheet/sheet-private.h

src/sheet/sheet.c

src/sheet/sheet.h

src/sheet/textbox-item.c

src/sheet/textbox-item.h

src/sheet/wire-item.c

src/sheet/wire-item.h

src/sim-settings.c

src/sim-settings.h

src/simulation.c

src/simulation.h

src/smallicon.c

src/smallicon.h

src/type-utils.h

src/xml-compat.h

src/xml-helper.c

src/xml-helper.h

Older »