Skip to content

Commit b27b538

Browse files
author
Eddie Machado
committed
Merge pull request eddiemachado-zz#465 from cfoellmann/collab
Cross platform collab
2 parents e53bd9a + 46c88bd commit b27b538

2 files changed

Lines changed: 54 additions & 3 deletions

File tree

.gitattributes

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
# Standards for multi-platform colaboration
2+
3+
# Set default behaviour, in case users don't have core.autocrlf set.
4+
* text=auto

.gitignore

Lines changed: 50 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,55 @@
1+
# folders and files to be ignored by git
12

2-
Bones.esproj/user.Eddie.espressostorage
3+
############
4+
## Bones
5+
############
36

4-
Bones.esproj/Project.espressostorage
7+
Bones.esproj/
58

9+
############
10+
## IDEs
11+
############
12+
13+
*.pydevproject
614
.project
15+
.metadata
16+
*.swp
17+
*~.nib
18+
local.properties
19+
.classpath
20+
.settings/
21+
.loadpath
22+
.externalToolBuilders/
23+
*.launch
24+
.cproject
25+
.buildpath
26+
nbproject/
27+
28+
############
29+
## OSes
30+
############
31+
32+
[Tt]humbs.db
33+
[Dd]esktop.ini
34+
*.DS_store
35+
.DS_store?
36+
37+
############
38+
## Misc
39+
############
40+
41+
bin/
42+
tmp/
43+
*.tmp
44+
*.bak
45+
*.log
46+
*.[Cc]ache
47+
*.cpr
48+
*.orig
49+
*.php.in
50+
.idea/
51+
temp/
52+
._*
53+
.Trashes
754

8-
.DS_Store
55+
.svn

0 commit comments

Comments
 (0)