Skip to content

Commit

Permalink
Merge branch 'master' into ueb
Browse files Browse the repository at this point in the history
  • Loading branch information
mhameed committed Jun 16, 2014
2 parents d83d4b9 + d128f98 commit 527174c
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 3 deletions.
31 changes: 31 additions & 0 deletions autogen.sh
@@ -1,5 +1,36 @@
#!/bin/sh
#
# liblouis Braille Translation and Back-Translation
# Library
#
# Based on the Linux screenreader BRLTTY, copyright (C) 1999-2006 by
# The BRLTTY Team
#
# Copyright (C) 2004, 2005, 2006
# ViewPlus Technologies, Inc. www.viewplus.com
# and
# abilitiessoft, Inc. www.abilitiessoft.com
# All rights reserved
#
# Copyright (C) 2006--2013 by The Liblouis Team
#
# This file is free software; you can redistribute it and/or modify it
# under the terms of the Lesser or Library GNU General Public License
# (LGPL) as published by the
# Free Software Foundation; either version 3, or (at your option) any
# later version.
#
# This file is distributed in the hope that it will be useful, but
# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# Library GNU General Public License for more details.
#
# You should have received a copy of the Library GNU General Public
# License along with this program; see the file COPYING. If not,
# write to
# the Free Software Foundation, 51 Franklin Street, Fifth Floor,
# Boston, MA 02110-1301, USA.
#
# autogen.sh glue for liblouis
#
# Requires: automake 1.9, autoconf 2.57+
Expand Down
6 changes: 3 additions & 3 deletions liblouis/lou_translateString.c
Expand Up @@ -7,12 +7,12 @@ Library
Copyright (C) 2004, 2005, 2006
ViewPlus Technologies, Inc. www.viewplus.com
and
JJB Software, Inc. www.jjb-software.com
abilitiessoft, Inc. www.abilitiessoft.com
All rights reserved
This file is free software; you can redistribute it and/or modify it
under the terms of the Lesser or Library GNU General Public License
as published by the
(LGPL) as published by the
Free Software Foundation; either version 3, or (at your option) any
later version.
Expand All @@ -26,7 +26,7 @@ Library
the Free Software Foundation, 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
Maintained by John J. Boyer john.boyer@jjb-software.com
Maintained by John J. Boyer john.boyer@abilitiessoft.com
*/

#include <stdio.h>
Expand Down

0 comments on commit 527174c

Please sign in to comment.