diff options
| author |  ridiculousfish <corydoras@ridiculousfish.com> | 2013-12-20 17:44:37 -0800 |
|---|---|---|
| committer | ridiculousfish <corydoras@ridiculousfish.com> | 2013-12-20 17:44:37 -0800 |
| commit | ed70195c7eda1040e596c3f7a1a417d4ec888242 (patch) | |
| tree | 9bcbcddd51fde2a75aaa3aa5cb1cb61a5a5fc4e5 /xdgmimeparent.cpp | |
| parent | 739e529416c3917d1e75d1a41850762a327e6ea9 (diff) | |
| parent | e38217683c65f53fcaa3b6a5daedb6b23b408a90 (diff) | |
Merge branch 'master' into ast
Conflicts:
function.cpp
parser.cpp
parser.h
Diffstat (limited to 'xdgmimeparent.cpp')
| -rw-r--r-- | xdgmimeparent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/xdgmimeparent.cpp b/xdgmimeparent.cpp index 3e51c295..d0fa617d 100644 --- a/xdgmimeparent.cpp +++ b/xdgmimeparent.cpp @@ -21,8 +21,8 @@ * * You should have received a copy of the GNU Lesser General Public * License along with this library; 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. */ #ifdef HAVE_CONFIG_H |