Merge branch 'master' of https://github.com/AppleCommander/AppleCommander into mac-unistub

2017-11-05 00:51:44 -07:00 · 2017-11-05 00:51:44 -07:00 · 3048cd3dfe
parent 160c888e0f 7ed762b89b
commit 3048cd3dfe
6 changed files with 20 additions and 19 deletions
--- a/.cvsignore
+++ b/.cvsignore
@ -1,13 +0,0 @@
-bin
-AppleCommander.preferences
-*.dsk
-*.po
-*.hdv
-*.do
-*.2mg
-*.2img
-.uml
-TODO.local
-*.jpage
-work
-TestImage.*
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,20 @@
+bin
+AppleCommander.preferences
+*.dsk
+*.po
+*.hdv
+*.do
+*.2mg
+*.2img
+.uml
+TODO.local
+*.jpage
+work
+TestImage.*
+**/Thumbs.db
+mac/AppleCommander.app/Contents/Resources/Java/AppleCommander.jar
+mac/AppleCommander.app/Contents/Info.plist
+.settings/org.eclipse.jdt.ui.prefs
+.settings/org.eclipse.jdt.core.prefs
+build/ACBuild.properties
+build/AppleCommander.preferences
--- a/.settings/.cvsignore
+++ b/.settings/.cvsignore
@ -1,2 +0,0 @@
-org.eclipse.jdt.ui.prefs
-org.eclipse.jdt.core.prefs
--- a/build/.cvsignore
+++ b/build/.cvsignore
@ -1,2 +0,0 @@
-ACBuild.properties
-AppleCommander.preferences
--- a/imageSource/.cvsignore
+++ b/imageSource/.cvsignore
@ -1 +0,0 @@
-Thumbs.db
--- a/src/com/webcodepro/applecommander/ui/images/.cvsignore
+++ b/src/com/webcodepro/applecommander/ui/images/.cvsignore
@ -1 +0,0 @@
-Thumbs.db