{"action":"created","issue":{"url":"https://api.github.com/repos/votca/ctp/issues/77","labels_url":"https://api.github.com/repos/votca/ctp/issues/77/labels{/name}","comments_url":"https://api.github.com/repos/votca/ctp/issues/77/comments","events_url":"https://api.github.com/repos/votca/ctp/issues/77/events","html_url":"https://github.com/votca/ctp/pull/77","id":109400781,"number":77,"title":"merge in master","user":{"login":"junghans","id":439483,"avatar_url":"https://avatars.githubusercontent.com/u/439483?v=3","gravatar_id":"","url":"https://api.github.com/users/junghans","html_url":"https://github.com/junghans","followers_url":"https://api.github.com/users/junghans/followers","following_url":"https://api.github.com/users/junghans/following{/other_user}","gists_url":"https://api.github.com/users/junghans/gists{/gist_id}","starred_url":"https://api.github.com/users/junghans/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/junghans/subscriptions","organizations_url":"https://api.github.com/users/junghans/orgs","repos_url":"https://api.github.com/users/junghans/repos","events_url":"https://api.github.com/users/junghans/events{/privacy}","received_events_url":"https://api.github.com/users/junghans/received_events","type":"User","site_admin":false},"labels":[],"state":"closed","locked":false,"assignee":{"login":"12AngryMen","id":12139113,"avatar_url":"https://avatars.githubusercontent.com/u/12139113?v=3","gravatar_id":"","url":"https://api.github.com/users/12AngryMen","html_url":"https://github.com/12AngryMen","followers_url":"https://api.github.com/users/12AngryMen/followers","following_url":"https://api.github.com/users/12AngryMen/following{/other_user}","gists_url":"https://api.github.com/users/12AngryMen/gists{/gist_id}","starred_url":"https://api.github.com/users/12AngryMen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/12AngryMen/subscriptions","organizations_url":"https://api.github.com/users/12AngryMen/orgs","repos_url":"https://api.github.com/users/12AngryMen/repos","events_url":"https://api.github.com/users/12AngryMen/events{/privacy}","received_events_url":"https://api.github.com/users/12AngryMen/received_events","type":"User","site_admin":false},"milestone":null,"comments":3,"created_at":"2015-10-01T22:59:30Z","updated_at":"2015-10-02T13:45:59Z","closed_at":"2015-10-01T23:56:16Z","pull_request":{"url":"https://api.github.com/repos/votca/ctp/pulls/77","html_url":"https://github.com/votca/ctp/pull/77","diff_url":"https://github.com/votca/ctp/pull/77.diff","patch_url":"https://github.com/votca/ctp/pull/77.patch"},"body":"Just to avoid that they diverge more."},"comment":{"url":"https://api.github.com/repos/votca/ctp/issues/comments/145025373","html_url":"https://github.com/votca/ctp/pull/77#issuecomment-145025373","issue_url":"https://api.github.com/repos/votca/ctp/issues/77","id":145025373,"user":{"login":"12AngryMen","id":12139113,"avatar_url":"https://avatars.githubusercontent.com/u/12139113?v=3","gravatar_id":"","url":"https://api.github.com/users/12AngryMen","html_url":"https://github.com/12AngryMen","followers_url":"https://api.github.com/users/12AngryMen/followers","following_url":"https://api.github.com/users/12AngryMen/following{/other_user}","gists_url":"https://api.github.com/users/12AngryMen/gists{/gist_id}","starred_url":"https://api.github.com/users/12AngryMen/starred{/owner}{/repo}","subscriptions_url":"https://api.github.com/users/12AngryMen/subscriptions","organizations_url":"https://api.github.com/users/12AngryMen/orgs","repos_url":"https://api.github.com/users/12AngryMen/repos","events_url":"https://api.github.com/users/12AngryMen/events{/privacy}","received_events_url":"https://api.github.com/users/12AngryMen/received_events","type":"User","site_admin":false},"created_at":"2015-10-02T13:45:59Z","updated_at":"2015-10-02T13:45:59Z","body":"hey ist gemacht.\n\nich werde keine pull request mehr akzeptieren. :) Danke\n\n2015-10-02 15:26 GMT+02:00 Christoph Junghans <notifications@github.com>:\n\n> I think, I screwed something up in this merge! Can you please push your fix\n> to make it compile again and I will take care of the remaining travis\n> issues!\n>\n> Am 02.10.2015 1:03 nachm. schrieb \"12AngryMen\" <notifications@github.com>:\n> >\n> > Hallo Christoph,\n> >\n> > kannst du mir mal fuer dumme erklaeren was da mit dem merge passiert ist.\n> > Danke\n> >\n> > LG Jens\n> >\n> > 2015-10-02 0:59 GMT+02:00 Christoph Junghans <notifications@github.com>:\n> >\n> > > Just to avoid that they diverge more.\n> > > ------------------------------\n> > > You can view, comment on, or merge this pull request online at:\n> > >\n> > > https://github.com/votca/ctp/pull/77\n> > > Commit Summary\n> > >\n> > > - Closing old branch\n> > > - Closing old branch\n> > > - trying to merge\n> > > - merged with carl\n> > > - Fixed 'trimming' to larger number of unoccupied states than available\n> > > - merge two default heads from Bjoern & Pascal\n> > > - dummy merge with Denis default branch\n> > > - dummy merge with Denis even older default branch\n> > > - cmake: updated modules\n> > > - cmake: allow version from git, too\n> > > - remove auto-generated Doxyfile\n> > > - fixed some format warnings\n> > > - ctp_testsuite, ctp_update only support python2\n> > > - fixed many many warnings\n> > > - gcc warning: added LOG_SAVE\n> > > - fixed some more warning found by travis\n> > > - fixed even some more warning found by travis\n> > > - some more warning found by travis\n> > > - fixed more warning\n> > > - fixed a bug introduced in b9ba31880eb5\n> > > - merge with googlecode\n> > > - fixed more bugs introduced in b9ba31880eb5\n> > > - ctp_dump rates, minor bug fix\n> > > - updated CHANGELOG.md\n> > > - merge with googlecode\n> > > - added .travis.yml\n> > > - hg -> git\n> > > - cmake: some tweaks for global build\n> > > - cmake: fixed an out-of-source issue\n> > > - .travis.yml: update\n> > > - Merge branch 'master' into wehnerj\n> > >\n> > > File Changes\n> > >\n> > > - *R* .gitignore <https://github.com/votca/ctp/pull/77/files#diff-0>\n> > > (5)\n> > > - *D* .hgtags <https://github.com/votca/ctp/pull/77/files#diff-1> (1)\n> > > - *A* .travis.yml <https://github.com/votca/ctp/pull/77/files#diff-2>\n> > > (61)\n> > > - *R* CHANGELOG.md <https://github.com/votca/ctp/pull/77/files#diff-3>\n> > > (16)\n> > > - *M* CMakeLists.txt\n> > > <https://github.com/votca/ctp/pull/77/files#diff-4> (18)\n> > > - *D* CMakeModules/FindVOTCA_BOOST.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-5> (37)\n> > > - *M* CMakeModules/FindVOTCA_CSG.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-6> (22)\n> > > - *D* CMakeModules/FindVOTCA_KMCOLD.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-7> (59)\n> > > - *M* CMakeModules/FindVOTCA_MOO.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-8> (6)\n> > > - *M* CMakeModules/FindVOTCA_TOOLS.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-9> (22)\n> > > - *M* CMakeModules/hgscript.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-10> (25)\n> > > - *M* CMakeModules/hgversion.cmake\n> > > <https://github.com/votca/ctp/pull/77/files#diff-11> (26)\n> > > - *M* include/votca/ctp/apolarsite.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-12> (11)\n> > > - *M* include/votca/ctp/atom.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-13> (37)\n> > > - *M* include/votca/ctp/ewaldactor.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-14> (4)\n> > > - *M* include/votca/ctp/fragment.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-15> (14)\n> > > - *M* include/votca/ctp/job.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-16> (6)\n> > > - *M* include/votca/ctp/logger.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-17> (4)\n> > > - *M* include/votca/ctp/molecule.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-18> (2)\n> > > - *M* include/votca/ctp/progressobserver.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-19> (10)\n> > > - *M* include/votca/ctp/qmnblist.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-20> (2)\n> > > - *M* include/votca/ctp/qmpackage.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-21> (1)\n> > > - *M* include/votca/ctp/qmpair.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-22> (10)\n> > > - *M* include/votca/ctp/segment.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-23> (10)\n> > > - *M* include/votca/ctp/segmenttype.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-24> (4)\n> > > - *M* include/votca/ctp/topology.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-25> (6)\n> > > - *M* include/votca/ctp/xinductor.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-26> (30)\n> > > - *M* include/votca/ctp/xinteractor.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-27> (8)\n> > > - *M* include/votca/ctp/xjob.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-28> (10)\n> > > - *M* scripts/CMakeLists.txt\n> > > <https://github.com/votca/ctp/pull/77/files#diff-29> (4)\n> > > - *M* scripts/ctp_testsuite.in\n> > > <https://github.com/votca/ctp/pull/77/files#diff-30> (2)\n> > > - *M* scripts/ctp_update.in\n> > > <https://github.com/votca/ctp/pull/77/files#diff-31> (2)\n> > > - *M* share/doc/CMakeLists.txt\n> > > <https://github.com/votca/ctp/pull/77/files#diff-32> (10)\n> > > - *D* share/doc/Doxyfile\n> > > <https://github.com/votca/ctp/pull/77/files#diff-33> (1513)\n> > > - *M* src/libctp/CMakeLists.txt\n> > > <https://github.com/votca/ctp/pull/77/files#diff-34> (7)\n> > > - *M* src/libctp/calculators/einternal.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-35> (2)\n> > > - *M* src/libctp/calculators/emultipole.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-36> (40)\n> > > - *M* src/libctp/calculators/emultipole_stdal.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-37> (38)\n> > > - *M* src/libctp/calculators/eoutersphere.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-38> (34)\n> > > - *M* src/libctp/calculators/ianalyze.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-39> (2)\n> > > - *M* src/libctp/calculators/iimport.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-40> (32)\n> > > - *M* src/libctp/calculators/izindo.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-41> (20)\n> > > - *M* src/libctp/calculators/jobwriter.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-42> (2)\n> > > - *M* src/libctp/calculators/neighborlist.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-43> (3)\n> > > - *M* src/libctp/calculators/pairdump.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-44> (2)\n> > > - *M* src/libctp/calculators/profile.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-45> (6)\n> > > - *M* src/libctp/calculators/qmultipole.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-46> (28)\n> > > - *M* src/libctp/calculators/sandbox.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-47> (19)\n> > > - *M* src/libctp/calculators/stateserver.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-48> (6)\n> > > - *M* src/libctp/calculators/tdump.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-49> (2)\n> > > - *M* src/libctp/calculators/vaverage.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-50> (4)\n> > > - *M* src/libctp/calculators/velocity.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-51> (2)\n> > > - *M* src/libctp/calculators/xmultipole2.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-52> (58)\n> > > - *M* src/libctp/calculators/zmultipole.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-53> (26)\n> > > - *M* src/libctp/ewald3d.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-54> (14)\n> > > - *M* src/libctp/fragment.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-55> (4)\n> > > - *M* src/libctp/jobcalculators/dma.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-56> (2)\n> > > - *M* src/libctp/jobcalculators/ewald.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-57> (2)\n> > > - *M* src/libctp/jobcalculators/qmmm.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-58> (6)\n> > > - *M* src/libctp/jobcalculators/xqmultipole.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-59> (6)\n> > > - *M* src/libctp/molecule.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-60> (4)\n> > > - *M* src/libctp/orbitals.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-61> (4)\n> > > - *M* src/libctp/overlap.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-62> (2)\n> > > - *M* src/libctp/parallelpaircalc.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-63> (8)\n> > > - *M* src/libctp/parallelxjobcalc.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-64> (14)\n> > > - *M* src/libctp/poissongrid.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-65> (14)\n> > > - *M* src/libctp/polarfrag.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-66> (8)\n> > > - *M* src/libctp/polarseg.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-67> (18)\n> > > - *M* src/libctp/polarsite.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-68> (12)\n> > > - *M* src/libctp/progressobserver.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-69> (9)\n> > > - *M* src/libctp/qmmachine.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-70> (24)\n> > > - *M* src/libctp/qmnblist.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-71> (4)\n> > > - *M* src/libctp/qmpackages/turbomole.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-72> (6)\n> > > - *M* src/libctp/qmpair.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-73> (8)\n> > > - *M* src/libctp/segment.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-74> (2)\n> > > - *M* src/libctp/statesaversqlite.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-75> (5)\n> > > - *M* src/libctp/tools/log2mps.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-76> (6)\n> > > - *M* src/libctp/tools/molpol.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-77> (4)\n> > > - *M* src/libctp/tools/pdb2map.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-78> (9)\n> > > - *M* src/libctp/tools/pdb2top.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-79> (5)\n> > > - *M* src/libctp/tools/ptopreader.h\n> > > <https://github.com/votca/ctp/pull/77/files#diff-80> (3)\n> > > - *M* src/libctp/topology.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-81> (8)\n> > > - *M* src/libctp/xjob.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-82> (10)\n> > > - *M* src/libctp/xmapper.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-83> (26)\n> > > - *M* src/tools/Md2QmEngine.cc\n> > > <https://github.com/votca/ctp/pull/77/files#diff-84> (3)\n> > >\n> > > Patch Links:\n> > >\n> > > - https://github.com/votca/ctp/pull/77.patch\n> > > - https://github.com/votca/ctp/pull/77.diff\n> >\n> > >\n> > > —\n> > > Reply to this email directly or view it on GitHub\n> > > <https://github.com/votca/ctp/pull/77>.\n>\n> >\n> > >\n> >\n> > —\n> > Reply to this email directly or view it on GitHub.\n>\n> —\n> Reply to this email directly or view it on GitHub\n> <https://github.com/votca/ctp/pull/77#issuecomment-145019717>.\n>\n"}}