projects
/
unres.git
/ blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
history
|
raw
|
HEAD
Merge branch 'adasko' into devel
[unres.git]
/
.gitignore
1
<<<<<<< HEAD
2
# ignore compiled stuff
3
*.[oa]
4
5
# ignore texteditors
6
*.swp
7
*~
8
9
10
# ifnore build dir
11
build/
12
=======
13
~.[ao]
14
gradcheck/
15
mapcheck/
16
run/
17
sympcheck/
18
>>>>>>> adasko
19