<p>Originally it was just possible to choose between the GPLv2 and the 3-clause BSD.<br>
Now users can also choose between the GPLv3 and AGPLv3 when adding a licence comment to a file.</p>

<hr>

<h4>You can view, comment on, or merge this pull request online at:</h4>
<p>  <a href='https://github.com/geany/geany/pull/1331'>https://github.com/geany/geany/pull/1331</a></p>

<h4>Commit Summary</h4>
<ul>
  <li>Added possibility to choose between GPLv2 and 3 when adding licence comment to file</li>
  <li>Merge my local changes into master</li>
  <li>Reformatted a line of code</li>
  <li>Renamed some identifiers to clarify with wich values they are handling.</li>
  <li>Added possibility to choose AGPLv3 when adding licence comment</li>
</ul>

<h4>File Changes</h4>
<ul>
  <li>
    <strong>M</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-0">data/Makefile.am</a>
    (4)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-1">data/geany.glade</a>
    (48)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-2">data/templates/agplv3</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-3">data/templates/fileheader</a>
    (2)
  </li>
  <li>
    <strong>R</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-4">data/templates/gplv2</a>
    (0)
  </li>
  <li>
    <strong>A</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-5">data/templates/gplv3</a>
    (12)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-6">src/callbacks.c</a>
    (32)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-7">src/templates.c</a>
    (13)
  </li>
  <li>
    <strong>M</strong>
    <a href="https://github.com/geany/geany/pull/1331/files#diff-8">src/templates.h</a>
    (4)
  </li>
</ul>

<h4>Patch Links:</h4>
<ul>
  <li><a href='https://github.com/geany/geany/pull/1331.patch'>https://github.com/geany/geany/pull/1331.patch</a></li>
  <li><a href='https://github.com/geany/geany/pull/1331.diff'>https://github.com/geany/geany/pull/1331.diff</a></li>
</ul>

<p style="font-size:small;-webkit-text-size-adjust:none;color:#666;">—<br />You are receiving this because you are subscribed to this thread.<br />Reply to this email directly, <a href="https://github.com/geany/geany/pull/1331">view it on GitHub</a>, or <a href="https://github.com/notifications/unsubscribe-auth/ABDrJ_xrFjp35yRda9_sxVMhr9BkcQKVks5rFiG1gaJpZM4LGJQG">mute the thread</a>.<img alt="" height="1" src="https://github.com/notifications/beacon/ABDrJ3x6VNxJfYOp6yZtuJfl4psE_SzFks5rFiG1gaJpZM4LGJQG.gif" width="1" /></p>
<div itemscope itemtype="http://schema.org/EmailMessage">
<div itemprop="action" itemscope itemtype="http://schema.org/ViewAction">
  <link itemprop="url" href="https://github.com/geany/geany/pull/1331"></link>
  <meta itemprop="name" content="View Pull Request"></meta>
</div>
<meta itemprop="description" content="View this Pull Request on GitHub"></meta>
</div>

<script type="application/json" data-scope="inboxmarkup">{"api_version":"1.0","publisher":{"api_key":"05dde50f1d1a384dd78767c55493e4bb","name":"GitHub"},"entity":{"external_key":"github/geany/geany","title":"geany/geany","subtitle":"GitHub repository","main_image_url":"https://cloud.githubusercontent.com/assets/143418/17495839/a5054eac-5d88-11e6-95fc-7290892c7bb5.png","avatar_image_url":"https://cloud.githubusercontent.com/assets/143418/15842166/7c72db34-2c0b-11e6-9aed-b52498112777.png","action":{"name":"Open in GitHub","url":"https://github.com/geany/geany"}},"updates":{"snippets":[{"icon":"DESCRIPTION","message":"Added possibility to choose between different *GPL licences  (#1331)"}],"action":{"name":"View Pull Request","url":"https://github.com/geany/geany/pull/1331"}}}</script>