.gitignore@b4a990f59a5e
    .gitignore
    Thu, 17 Apr 2014 20:50:43 +0300
    
        - author
 
        - Santeri Piippo <crimsondusk64@gmail.com>
 
        - date
 
        - Thu, 17 Apr 2014 20:50:43 +0300
 
        
        - changeset 714
 
        - b4a990f59a5e
 
        
- parent 634
 
- 
5ef894f699d7
 
        
        - permissions
 
        - -rw-r--r--
 
    
    Merge ../ldforge into gl
Conflicts:
	src/actionsEdit.cc
	src/glRenderer.cc
	src/ldDocument.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