]> hackdaworld.org Git - physik/posic.git/commit
projects / physik / posic.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 97dc63e 98df942)
Merge branch 'leadoff' master
authorhackbard <hackbard@hackdaworld.org>
Mon, 20 Feb 2012 15:55:56 +0000 (16:55 +0100)
committerhackbard <hackbard@hackdaworld.org>
Mon, 20 Feb 2012 15:55:56 +0000 (16:55 +0100)
commit6e6d7126ea9a845f11637d8e1b8eb2b570ac4dc9
tree13beeec347459055e64d395b613c273455f21faetree | snapshot
parent97dc63eb6a519b8e1f4fbfaa9760dd94539436b0commit | diff
parent98df942a2412e6ace72ae221f2e967f24bba7108commit | diff
Merge branch 'leadoff'

Conflicts:
Makefile
moldyn.c
potentials/albe.c
potentials/albe.h
runmd

 ... hopefully fixed! Just a test to merge leadoff back to master! :)
mdrun.c diff1 | diff2 | blob | history
moldyn.c diff1 | diff2 | blob | history
moldyn.h diff1 | diff2 | blob | history
potentials/albe.c diff1 | diff2 | blob | history
potentials/albe.h diff1 | diff2 | blob | history
Unnamed repository; edit this file to name it for gitweb.