Commit 5b2becd0 authored by Axel Kohlmeyer's avatar Axel Kohlmeyer
Browse files

Merge branch 'integration' into new-master

parents 78a22be9 596b260f

.gitignore

0 → 100644
+34 −0
Original line number Diff line number Diff line 
*~

*.o

*.so

*.cu_o

*.ptx

*_ptx.h

*.a

*.d

*.x

*.exe

*.dll

*.pyc

__pycache__



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

doc/utils/converters/.gitignore

+0 −1
Original line number Diff line number Diff line 
__pycache__

*.egg-info

examples/COUPLE/fortran2/.gitignore

0 → 100644
+1 −0
Original line number Diff line number Diff line 
*.mod

examples/USER/misc/ti/in.ti_spring

100755 → 100644
+0 −0

File mode changed from 100755 to 100644.

View file

CRA Git | Maintained and supported by SUSTech CRA and CCSE