icons/isecalc.png@31540c1f22ea
icons/isecalc.png
Mon, 20 Jan 2014 15:04:26 +0200
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Mon, 20 Jan 2014 15:04:26 +0200
- changeset 667
- 31540c1f22ea
- parent 206
- c069e7b5f5f3
- child 729
- dcd7e3e86374
- permissions
- -rw-r--r--
- Merge commit '5c835eb' into HEAD
Conflicts:
src/file.cpp
src/gldraw.cc
src/gldraw.h
