Brad Arant
381ed86875
The merge commit (3609ed6) used git add -A to handle the large number
of deletes/renames from conflict resolution, which also picked up 22
untracked *.pre-* files - local safety-copy backups made before
editing tracked files, never meant to be committed. Untracked (kept on
disk) rather than deleted, and added *.pre-* to .gitignore so this
does not recur.
15 lines
130 B
Plaintext
15 lines
130 B
Plaintext
Debug
|
|
Release
|
|
*.o
|
|
*~
|
|
*.mk
|
|
.history
|
|
libServerCore.a
|
|
docs/latex/
|
|
docs/html
|
|
*/*.ipch
|
|
*/mmap_address.bin
|
|
.history/*
|
|
html
|
|
latex*.pre-*
|