From c990a8e15685aa94803b375ce2963aea7efef731 Mon Sep 17 00:00:00 2001 From: Erik T Lindsay Date: Fri, 1 May 2015 14:56:05 -0400 Subject: [PATCH] Revert "jars?" This reverts commit e136ae843cac0dc2016e0362c85fee99fb954e7b. --- .gitattributes | 17 ++++++++++++++++ .gitignore | 43 +++++++++++++++++++++++++++++++++++++++++ LavaJava/bin/.gitignore | 23 ---------------------- 3 files changed, 60 insertions(+), 23 deletions(-) create mode 100644 .gitattributes create mode 100644 .gitignore delete mode 100644 LavaJava/bin/.gitignore diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..bdb0cab --- /dev/null +++ b/.gitattributes @@ -0,0 +1,17 @@ +# Auto detect text files and perform LF normalization +* text=auto + +# Custom for Visual Studio +*.cs diff=csharp + +# Standard to msysgit +*.doc diff=astextplain +*.DOC diff=astextplain +*.docx diff=astextplain +*.DOCX diff=astextplain +*.dot diff=astextplain +*.DOT diff=astextplain +*.pdf diff=astextplain +*.PDF diff=astextplain +*.rtf diff=astextplain +*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..96374c4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,43 @@ +# Windows image file caches +Thumbs.db +ehthumbs.db + +# Folder config file +Desktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msm +*.msp + +# Windows shortcuts +*.lnk + +# ========================= +# Operating System Files +# ========================= + +# OSX +# ========================= + +.DS_Store +.AppleDouble +.LSOverride + +# Thumbnails +._* + +# Files that might appear on external disk +.Spotlight-V100 +.Trashes + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk diff --git a/LavaJava/bin/.gitignore b/LavaJava/bin/.gitignore deleted file mode 100644 index e329037..0000000 --- a/LavaJava/bin/.gitignore +++ /dev/null @@ -1,23 +0,0 @@ -/BoundingBox.class -/Button.class -/Game.class -/Grass.class -/Lava.class -/Level.class -/Level1.class -/Level2.class -/Level3.class -/LevelSelect.class -/LevelWon.class -/Map.class -/Player.class -/ScoreBox.class -/SwitchTile1.class -/SwitchTile2.class -/SwitchTile3.class -/SwitchTileRandom.class -/Tile.class -/Wall.class -/WinTile.class -/helpers/ -/res/