[XtalOpt-devel] [dlonie/XtalOpt] 40baa4: Merge branch 'master' of github.com:dlonie/XtalOpt

[noreply at github.com]

Branch: refs/heads/master
Home:   https://github.com/dlonie/XtalOpt

Commit: 40baa4b63ababd74bd8652d58c43b0f085b312e4
    https://github.com/dlonie/XtalOpt/commit/40baa4b63ababd74bd8652d58c43b0f085b312e4
Author: David C. Lonie <loniedavid at gmail.com>
Date:   2010-07-26 (Mon, 26 Jul 2010)

Changed paths:
  M docs/xtalopt/tutorials/gulp.dox
  M docs/xtalopt/tutorials/pwscf.dox
  M docs/xtalopt/tutorials/vasp.dox

Log Message:
-----------
Merge branch 'master' of github.com:dlonie/XtalOpt


Commit: 6bde64dbfa75c2c8e4d415944bead8a13b9a7b80
    https://github.com/dlonie/XtalOpt/commit/6bde64dbfa75c2c8e4d415944bead8a13b9a7b80
Author: David C. Lonie <loniedavid at gmail.com>
Date:   2010-07-26 (Mon, 26 Jul 2010)

Changed paths:
  M samples/gamess-randomdock.scheme
  M src/globalsearch/optbase.cpp
  M src/globalsearch/optbase.h
  M src/globalsearch/optimizer.cpp
  M src/globalsearch/optimizer.h
  M src/globalsearch/queuemanager.cpp
  M src/globalsearch/structure.cpp
  M src/randomdock/randomdock.cpp
  M src/randomdock/randomdock.h
  M src/randomdock/ui/tab_conformers.cpp
  M src/randomdock/ui/tab_conformers.h
  M src/randomdock/ui/tab_plot.ui
  M src/randomdock/ui/tab_progress.cpp
  M src/randomdock/ui/tab_sys.cpp
  M src/randomdock/ui/tab_sys.ui

Log Message:
-----------
Merge conflict