commit fddb73c62d838aa64fda21b232b1f42d9ea510c7 parent 245adcaab2cd866a476d0f3e48aa29f26c8fbc7f Author: Fournier Nicolas <nicolas.fournier@ensta-paristech.fr> Date: Tue, 30 Jun 2015 14:01:42 +0200 Merge branch 'master' of taler.net:/var/git/mint Diffstat:
8 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/logos/fonts/perpetue/Perpetua Bold.ttf b/doc/logos/fonts/perpetue/Perpetua_Bold.ttf Binary files differ. diff --git a/doc/logos/fonts/perpetue/Perpetua Bold Italic.ttf b/doc/logos/fonts/perpetue/Perpetua_Bold_Italic.ttf Binary files differ. diff --git a/doc/logos/fonts/perpetue/Perpetua Italic.ttf b/doc/logos/fonts/perpetue/Perpetua_Italic.ttf Binary files differ. diff --git a/doc/logos/fonts/smoth_bight/Licencia de la fuente - Version en Espa§ol.txt b/doc/logos/fonts/smoth_bight/ELUA-es.txt diff --git a/doc/logos/fonts/smoth_bight/End User Licence Agreement.txt b/doc/logos/fonts/smoth_bight/ELUA.txt diff --git a/doc/logos/fonts/smoth_bight/Smoth-Bight Italic - Por Kustren.otf b/doc/logos/fonts/smoth_bight/Smoth-Bight Italic - Por Kustren.otf Binary files differ. diff --git a/doc/logos/fonts/smoth_bight/Smoth-Bight - Por Kustren.otf b/doc/logos/fonts/smoth_bight/Smoth-Bight.otf Binary files differ. diff --git a/src/util/os_installation.c b/src/util/os_installation.c @@ -14,8 +14,8 @@ You should have received a copy of the GNU General Public License along with GNUnet; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 59 Temple Place - Suite 330, - Boston, MA 02111-1307, USA. + Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. */ /**