[geany/geany] 6cba1e: Merge branch '1.24'

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Wed, 16 Apr 2014 16:58:31 UTC
Commit:      6cba1e0a47794282932383a08c8cd41ce65c1f21
             https://github.com/geany/geany/commit/6cba1e0a47794282932383a08c8cd41ce65c1f21

Log Message:
-----------
Merge branch '1.24'


Modified Paths:
--------------
    NEWS
    doc/geany.1.in
    doc/geany.html
    doc/geany.txt

Modified: NEWS
6 lines changed, 6 insertions(+), 0 deletions(-)
===================================================================
@@ -1,6 +1,12 @@
 Geany 1.25 (unreleased)
 
 
+Geany 1.24.1 (April 16, 2014)
+
+    General
+    * Fix distribution of custom GTK style files (#1037).
+
+
 Geany 1.24 (April 13, 2014)
 
     General


Modified: doc/geany.1.in
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -1,4 +1,4 @@
-.TH "GEANY" "1" "April 13, 2014" "geany @VERSION@" ""
+.TH "GEANY" "1" "April 16, 2014" "geany @VERSION@" ""
 .SH "NAME"
 Geany \(em a small and lightweight IDE
 .SH "SYNOPSIS"


Modified: doc/geany.html
12 lines changed, 6 insertions(+), 6 deletions(-)
===================================================================
@@ -6,7 +6,7 @@
 <meta name="generator" content="Docutils 0.11: http://docutils.sourceforge.net/" />
 <title>Geany</title>
 <meta name="authors" content="Enrico Tröger  Nick Treleaven  Frank Lanitz  Colomban Wendling  Matthew Brush" />
-<meta name="date" content="2014-04-13" />
+<meta name="date" content="2014-04-16" />
 <style type="text/css">
 
 /*
@@ -141,9 +141,9 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
 <br />Colomban Wendling
 <br />Matthew Brush</td></tr>
 <tr><th class="docinfo-name">Date:</th>
-<td>2014-04-13</td></tr>
+<td>2014-04-16</td></tr>
 <tr><th class="docinfo-name">Version:</th>
-<td>1.24</td></tr>
+<td>1.24.1</td></tr>
 </tbody>
 </table>
 <!-- -*- reStructuredText -*- -->
@@ -5810,7 +5810,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
 </tr>
 <tr><td>geanyversion</td>
 <td>The actual Geany version, e.g.
-"Geany 1.24".</td>
+"Geany 1.24.1".</td>
 <td>file templates, file header,
 function description, ChangeLog entry,
 bsd, gpl, snippets.</td>
@@ -6154,7 +6154,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
 look, run "<tt class="docutils literal">make doc</tt>" in the subdirectory <tt class="docutils literal">doc</tt> of Geany's source
 directory. This regenerates the <tt class="docutils literal">geany.html</tt> file. To generate a PDF
 file, use the command "<tt class="docutils literal">make pdf</tt>" which should generate a file called
-geany-1.24.pdf.</p>
+geany-1.24.1.pdf.</p>
 <p>After you are happy with your changes, create a patch e.g. by using:</p>
 <pre class="literal-block">
 % git diff geany.txt > foo.patch
@@ -6962,7 +6962,7 @@ <h2 class="subtitle" id="a-fast-light-gtk-ide">A fast, light, GTK+ IDE</h2>
 <div class="footer">
 <hr class="footer" />
 <a class="reference external" href="geany.txt">View document source</a>.
-Generated on: 2014-04-13 15:59 UTC.
+Generated on: 2014-04-16 15:16 UTC.
 Generated by <a class="reference external" href="http://docutils.sourceforge.net/">Docutils</a> from <a class="reference external" href="http://docutils.sourceforge.net/rst.html">reStructuredText</a> source.
 
 </div>


Modified: doc/geany.txt
2 lines changed, 1 insertions(+), 1 deletions(-)
===================================================================
@@ -14,7 +14,7 @@
           Frank Lanitz,
           Colomban Wendling,
           Matthew Brush
-:Date: 2014-04-13
+:Date: 2014-04-16
 :Version: |(version)|
 
 Copyright © 2005-2014



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).