<div dir="ltr">Hi Johnny,<div>                I have manually added your merge. Please test the latest commit.</div><div><br>Regards,</div><div>Utkarsh Tiwari</div></div><br><div class="gmail_quote"><div dir="ltr">On Sun, 5 Feb 2017 at 00:05 JAZEIX Johnny <<a href="mailto:jazeix@gmail.com">jazeix@gmail.com</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div bgcolor="#FFFFFF" text="#000000" class="gmail_msg">
    <div class="m_-2170413931725499497moz-cite-prefix gmail_msg">On 02/04/17 19:34, Utkarsh Tiwari
      wrote:<br class="gmail_msg">
    </div>
    <blockquote type="cite" class="gmail_msg">
      <div dir="ltr" class="gmail_msg">Hi,<br class="gmail_msg">
            The changes that you made with that patch might conflict
        with all the changes I have made until the latest commit. Would
        it be fine if I make those changes (instead of applying that
        patch to a previous commit) after my latest commit?<br class="gmail_msg">
        <br class="gmail_msg">
      </div>
    </blockquote></div><div bgcolor="#FFFFFF" text="#000000" class="gmail_msg">
    Yes, do the merge please :)</div><div bgcolor="#FFFFFF" text="#000000" class="gmail_msg"><br class="gmail_msg">
    <br class="gmail_msg">
    Johnny</div><div bgcolor="#FFFFFF" text="#000000" class="gmail_msg"><br class="gmail_msg">
    <br class="gmail_msg">
    <blockquote type="cite" class="gmail_msg">
      <div dir="ltr" class="gmail_msg">Regards,<br class="gmail_msg">
        Utkarsh Tiwari</div>
      <br class="gmail_msg">
      <div class="gmail_quote gmail_msg">
        <div dir="ltr" class="gmail_msg">On Sat, 4 Feb 2017 at 22:26 JAZEIX Johnny <<a href="mailto:jazeix@gmail.com" class="gmail_msg" target="_blank">jazeix@gmail.com</a>>
          wrote:<br class="gmail_msg">
        </div>
        <blockquote class="gmail_quote gmail_msg" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
          <div bgcolor="#FFFFFF" text="#000000" class="gmail_msg">
            <div class="m_-2170413931725499497m_9048553330728976911moz-cite-prefix gmail_msg">On
              02/04/17 15:42, Utkarsh Tiwari wrote:<br class="gmail_msg">
            </div>
            <blockquote type="cite" class="gmail_msg">
              <div dir="ltr" class="gmail_msg"><span style="font-size:13px" class="gmail_msg">Hi,</span>
                <div class="gmail_msg" style="font-size:13px">    Here
                  is latest commit for the Bargame-activity with
                  improved portrait mode - <a href="https://github.com/gcompris/GCompris-qt/pull/160/commits/7304c39bcafe3b129fe4aa73a100b5eb28832a2f" class="gmail_msg" target="_blank">https://github.com/gcompris/GCompris-qt/pull/160/commits/7304c39bcafe3b129fe4aa73a100b5eb28832a2f</a></div>
                <div class="gmail_msg" style="font-size:13px"><br class="gmail_msg">
                </div>
                <div class="gmail_msg" style="font-size:13px">Regards,</div>
                <div class="gmail_msg" style="font-size:13px">Utkarsh
                  Tiwari</div>
              </div>
            </blockquote>
          </div>
          <div bgcolor="#FFFFFF" text="#000000" class="gmail_msg">
            <p class="gmail_msg">Hi,</p>
            <p class="gmail_msg">there was a patch to apply in my latest
              comment that you didn't apply. Please take a look at it.<br class="gmail_msg">
            </p>
          </div>
          <div bgcolor="#FFFFFF" text="#000000" class="gmail_msg">
            <p class="gmail_msg">Johnny<br class="gmail_msg">
            </p>
          </div>
        </blockquote>
      </div>
    </blockquote>
    <p class="gmail_msg"><br class="gmail_msg">
    </p>
  </div></blockquote></div>