Merged 'dev_work', fixed merge.
commit566f25dc9d716ab7cdeb03ab87ba86d3552b8710
authorDaniel Schaffrath <daniel.schaffrath@mac.com>
Thu, 29 May 2008 12:23:09 +0000 (29 14:23 +0200)
committerDaniel Schaffrath <daniel.schaffrath@mac.com>
Thu, 29 May 2008 12:23:09 +0000 (29 14:23 +0200)
tree5356f7126b673a3da2509764ab11f99b2a685d2e
parent4f238532c191c422fdf45ba34b8d0362c35284c7
parentede0f0e8aada2e7a319aa84495907ec5ae441558
Merged 'dev_work', fixed merge.
Lattice.cpp
Lattice.h
LatticeParser.cpp
Makefile.am
Structure.h
StructureParser.cpp
cluster_expansion.cpp
structure.ini