@@ -79,7 +79,7 @@ namespace Avogadro { public: PythonTerminalEdit(QWidget *parent = 0); - virtual void keyPressEvent ( QKeyEvent * event ); + void keyPressEvent(QKeyEvent *event); void setMolecule(Molecule *molecule); libavogadro/src/extensions/pythonterminal.h @@ -133,7 +133,7 @@ void export_Molecule() &Molecule::numZMatrices, "The total number of ZMatrix objects in the Molecule.") .add_property("numConformers", - &Molecule::numZMatrices, + &Molecule::numConformers, "The number of conformers.") .add_property("atoms", libavogadro/src/python/molecule.cpp 1a6083cd2eaadac81f667a6a52d7b3a366a95411 edb43e20634ce8c9936634dcab78832e7e15643b Geoff Hutchison babel@geoffhutchison.net http://github.com/ghutchis/avogadro/commit/e769341c92a0d864593108cd26f6380fd37d5ced e769341c92a0d864593108cd26f6380fd37d5ced 2009-10-30T02:07:06-07:00 2009-10-30T02:07:06-07:00 Merge branch '1.0' of git@github.com:cryos/avogadro into 1.0 68c699bf27579103dee6857fca50ff27500e1290 Geoff Hutchison babel@geoffhutchison.net