.gitignore

Sat, 29 Mar 2014 05:38:03 +0200

author
Santeri Piippo <crimsondusk64@gmail.com>
date
Sat, 29 Mar 2014 05:38:03 +0200
changeset 706
d79083b9f74d
parent 634
5ef894f699d7
permissions
-rw-r--r--

Merge ../ldforge into gl

Conflicts:
CMakeLists.txt
src/actions.cc
src/glRenderer.cc
src/glRenderer.h
src/ldDocument.cc
src/ldDocument.h
src/ldObject.cc
src/ldObject.h
src/main.cc

build
build_shared
build_debug
build_release
*.kdev4
Makefile
Makefile.*
ldforge
ldforge_debug
*.dat
debug_lastOutput
debug_lastInput
.kdev_include_paths
*.cfg
Git.h
.kdev4

mercurial