Sat, 07 Sep 2013 13:23:09 +0300
Merge branch 'master' into gl, reworked stuff
Conflicts:
src/gldraw.cpp
src/gldraw.h
338
38f3c53357b6
remove ldforge.kdev4 and put it on ignore
Santeri Piippo <crimsondusk64@gmail.com>
parents:
diff
changeset
|
1 | build |
339
89e7c2d0a020
Also put all generated UI headers on ignore
Santeri Piippo <crimsondusk64@gmail.com>
parents:
338
diff
changeset
|
2 | ldforge.kdev4 |
341 | 3 | src/ui_*.h |
4 | Makefile | |
5 | ldforge | |
345
1376ad3262ba
Converted Ytruder interface to Designer UI
Santeri Piippo <crimsondusk64@gmail.com>
parents:
342
diff
changeset
|
6 | *.dat |
474
63838461cb72
add .kdev_include_paths to gitignore
Santeri Piippo <crimsondusk64@gmail.com>
parents:
345
diff
changeset
|
7 | debug_lastOutput |
63838461cb72
add .kdev_include_paths to gitignore
Santeri Piippo <crimsondusk64@gmail.com>
parents:
345
diff
changeset
|
8 | .kdev_include_paths |