.gitignore@31540c1f22ea
.gitignore
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 621
-
928365840d0d
- child 632
-
63e6243b880c
- permissions
- -rw-r--r--
- Merge commit '5c835eb' into HEAD
Conflicts:
src/file.cpp
src/gldraw.cc
src/gldraw.h
build
build_shared
build_debug
build_release
ldforge.kdev4
Makefile
Makefile.*
ldforge
ldforge_debug
*.dat
debug_lastOutput
debug_lastInput
.kdev_include_paths
*.cfg