Skip to content

Commit 249fbd3

Browse files
committed
.gitattributes file added to normalize line ending
In today's meeting it was decided that we normalize the line endings over the course of time instead of normalizing the whole repo at once. This *will* break git blame.
1 parent 167b6ca commit 249fbd3

15 files changed

+37
-14
lines changed

.gitattributes

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
# Set default behaviour, in case users don't have core.autocrlf set.
2+
* text=auto
3+
4+
# Explicitly declare text files we want to always be normalized and converted
5+
# to native line endings on checkout.
6+
*.java text
7+
*.xml text
8+
*.txt text
9+
*.md text
10+
11+
# Denote all files that are truly binary and should not be modified.
12+
# (binary is a macro for -text -diff)
13+
*.jar binary
14+
*.so binary
15+
*.png binary
16+
*.jpg binary
17+
*.jpeg binary
18+
*.bmp binary
19+
*.mp3 binary
20+
*.zip binary
21+
22+
# For more info see
23+
# https://timclem.wordpress.com/2012/03/01/mind-the-end-of-your-line/

catroid/res/color/spritelist_item_background.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424

2525
<selector xmlns:android="http://schemas.android.com/apk/res/android">

catroid/res/layout/activity_my_projects.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:id="@+id/MyProjectsActivityRoot"

catroid/res/layout/activity_project.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:id="@+id/ProjectActivityRoot"

catroid/res/layout/activity_project_spritelist_item.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="fill_parent"

catroid/res/layout/activity_scripttab.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_costume.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_costume_costumelist_footer.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_projects_list.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_script.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_sound.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_sound_soundlist_footer.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/layout/fragment_sprites_list.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2525
android:layout_width="match_parent"

catroid/res/menu/nativeapp_menu.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
2525

catroidUiTest/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
* GNU Affero General Public License for more details.
2020
*
2121
* You should have received a copy of the GNU Affero General Public License
22-
* along with this program. If not, see <http://www.gnu.org/licenses/>.
22+
* along with this program. If not, see <http://www.gnu.org/licenses/>.
2323
-->
2424
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2525
package="org.catrobat.catroid.uitest"

0 commit comments

Comments
 (0)