Commit a0592d1b authored by Steve Plimpton's avatar Steve Plimpton
Browse files

Merge branch 'gitignore-improvements' into integration

parents 2beecd1e 9be235d8
Loading
Loading
Loading
Loading

.gitignore

0 → 100644
+30 −0
Original line number Diff line number Diff line
*~
*.o
*.so
*.cu_o
*.ptx
*_ptx.h
*.a
*.d
*.x
*.exe
*.dll

Obj_*
log.lammps
log.cite
*.bz2
*.gz
*.tar
.*.swp
*.orig
*.rej
.vagrant

.DS_Store
.DS_Store?
._*
.Spotlight-V100
.Trashes
ehthumbs.db
Thumbs.db

doc/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line
/html
+1014 −14

File changed.

Preview size limit exceeded, changes collapsed.