.gitignore@4355e72ffd47
.gitignore
Wed, 23 Oct 2013 12:46:10 +0300
- author
- Santeri Piippo <crimsondusk64@gmail.com>
- date
- Wed, 23 Oct 2013 12:46:10 +0300
- changeset 665
- 4355e72ffd47
- parent 533
- d77811a0494e
- child 543
- 7029f7938dae
- permissions
- -rw-r--r--
Merge branch 'master' into gl
Conflicts:
src/file.cpp
src/gldraw.cpp
src/gldraw.h
src/gui.cpp
src/ldtypes.cpp
src/src.pro
src/types.h
build build_debug build_release ldforge.kdev4 Makefile Makefile.* ldforge ldforge_debug *.dat debug_lastOutput .kdev_include_paths
