summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNorbert Thiebaud <nthiebaud@gmail.com>2012-10-16 16:32:25 -0500
committerNorbert Thiebaud <nthiebaud@gmail.com>2012-10-16 16:32:25 -0500
commit2547e9657a49fb43e07a41aadfdd0af34b7ae720 (patch)
treefa82d140336ac2e645fbfd242802075678805259
parent508deb804294871ff540f669350f093a191d2e8e (diff)
rename mishappe during merge
-rw-r--r--.gitignore55
-rw-r--r--Dictionary_pt-BR.mk (renamed from Dictionary_pt.mk)0
-rw-r--r--Dictionary_pt-PT.mk (renamed from Dictionary_pt-pt.mk)0
3 files changed, 0 insertions, 55 deletions
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index eb75b8c..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,55 +0,0 @@
-#
-# Version: MPL 1.1 / GPLv3+ / LGPLv3+
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License or as specified alternatively below. You may obtain a copy of
-# the License at http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# Major Contributor(s):
-# [ Copyright (C) 2011 Stephan Bergmann, Red Hat Inc. <sbergman@redhat.com>
-# (initial developer) ]
-#
-# All Rights Reserved.
-#
-# For minor contributions see the git repository.
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
-# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
-# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
-# instead of those above.
-#
-
-# Backup files:
-*~
-
-# Build directories:
-/dictionaries/unxlng??
-/dictionaries/unxlng??.pro
-/dictionaries/unxlng???
-/dictionaries/unxlng???.pro
-/dictionaries/wntmsc???
-/dictionaries/wntmsc???.pro
-/dictionaries/wntgcc?
-/dictionaries/wntgcc?.pro
-/dictionaries/unxmac??
-/dictionaries/unxmac??.pro
-/dictionaries/unx?bsd??
-/dictionaries/unx?bsd??.pro
-/dictionaries/unxdfly??
-/dictionaries/unxdfly??.pro
-/dictionaries/unxso???
-/dictionaries/unxso???.pro
-/dictionaries/unxaig??
-/dictionaries/unxaig??.pro
-/dictionaries/unxios?
-/dictionaries/unxios?.pro
-/dictionaries/unxand?
-/dictionaries/unxand?.pro
-
diff --git a/Dictionary_pt.mk b/Dictionary_pt-BR.mk
index 9e0d45f..9e0d45f 100644
--- a/Dictionary_pt.mk
+++ b/Dictionary_pt-BR.mk
diff --git a/Dictionary_pt-pt.mk b/Dictionary_pt-PT.mk
index 12c68fe..12c68fe 100644
--- a/Dictionary_pt-pt.mk
+++ b/Dictionary_pt-PT.mk