• file
• latest
• revisions
• annotate
• diff
• comparison
• raw

.gitignore@4355e72ffd47 (annotated)

.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

338 38f3c53357b6 remove ldforge.kdev4 and put it on ignore Santeri Piippo <crimsondusk64@gmail.com> parents: diff changeset	1	build
533 d77811a0494e updated .gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 474 diff changeset	2	build_debug
d77811a0494e updated .gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 474 diff changeset	3	build_release
339 89e7c2d0a020 Also put all generated UI headers on ignore Santeri Piippo <crimsondusk64@gmail.com> parents: 338 diff changeset	4	ldforge.kdev4
341 84af360596f7 Update gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 339 diff changeset	5	Makefile
533 d77811a0494e updated .gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 474 diff changeset	6	Makefile.*
341 84af360596f7 Update gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 339 diff changeset	7	ldforge
533 d77811a0494e updated .gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 474 diff changeset	8	ldforge_debug
345 1376ad3262ba Converted Ytruder interface to Designer UI Santeri Piippo <crimsondusk64@gmail.com> parents: 342 diff changeset	9	*.dat
474 63838461cb72 add .kdev_include_paths to gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 345 diff changeset	10	debug_lastOutput
63838461cb72 add .kdev_include_paths to gitignore Santeri Piippo <crimsondusk64@gmail.com> parents: 345 diff changeset	11	.kdev_include_paths