Re: [AMBER-Developers] AmberTools12.lyx broken?

From: Qin Cai <qcai.uci.edu>
Date: Fri, 22 Mar 2013 19:30:35 -0700

I committed the revision to AmberTools12.lyx using Wes' account. I will check my commit and fix it ASAP if it's my problem.

Qin
On Mar 22, 2013, at 7:11 PM, David A Case wrote:

> On Fri, Mar 22, 2013, Daniel Roe wrote:
>>
>> AmberTools12.lyx is currently broken for me. Does anyone else have
>> trouble opening it?
>
> In spite of Robin's comments, the current head (56b3312b54b6dd257a) certainly
> appears broken to me. Here is the top of the git log:
>
> ------------------------------------------------------------------------
> commit 56b3312b54b6dd257ad97239ac6af4a7f71e7a03
> Merge: ec8a9c1 783d894
> Author: Robin Betz <rbetz.ucsd.edu>
> Date: Fri Mar 22 16:43:46 2013 -0700
>
> Merge branch 'master' of git.ambermd.org:amber
>
> commit ec8a9c14bdb2e92006cdf6b3e6a4102a9f879d53
> Author: Robin Betz <rbetz.ucsd.edu>
> Date: Fri Mar 22 16:43:21 2013 -0700
>
> Paramfit documentation update and addition of forces options in the
> wizard.
>
> commit 197ec2d0c60b29c7c926c58b7109af8291ead826
> Author: wmsmith <wmsmith.uci.edu>
> Date: Fri Mar 22 12:44:12 2013 -0700
>
> Updated AmberTools Manual sections
>
> Conflicts:
>
> doc/AmberTools12.lyx
>
> commit 1bee62dab5ccc8239e3302088b5939538b9aabf5
> Author: wmsmith <wmsmith.uci.edu>
> Date: Fri Mar 22 11:49:26 2013 -0700
>
> Updated AmberTools documentation for new pbsa features
> -epsmemb to control membrane dielectric
> -piccg conditioned version of periodic conjugate gradient solver
> -updated implicit membrane example section
>
> commit a1fb1359e326dddb1daa87a8f566b9895af7a30d
> Author: Daniel R. Roe <daniel.r.roe.gmail.com>
> Date: Fri Mar 22 09:14:39 2013 -0600
>
> DRR: Add documentation for the cpptraj action 'stfcdiffusion'.
> ------------------------------------------------------------------------
>
> The conflicts noted above (at 197ec2d0c60b29c7c926) indeed broke the file, but
> ec8a9c14bdb2e92006cdf looks OK. Hence, I placed that version at the head of
> master.
>
> Robin, Wes, Dan: please check to see if things are missing or broken.
>
> ...thanks...dave
>
>
> _______________________________________________
> AMBER-Developers mailing list
> AMBER-Developers.ambermd.org
> http://lists.ambermd.org/mailman/listinfo/amber-developers
>


_______________________________________________
AMBER-Developers mailing list
AMBER-Developers.ambermd.org
http://lists.ambermd.org/mailman/listinfo/amber-developers
Received on Fri Mar 22 2013 - 20:00:04 PDT
Custom Search