Skip to content

Commit bb06a7f

Browse files
committedJul 4, 2011
Fix merge conflicts

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed
 

‎.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ debian/*.substvars
1212
Makefile
1313
*-stamp
1414
api_doc
15-
build
15+
build*
1616
ms-windows/Installer-Files/postinstall.bat
1717
ms-windows/Installer-Files/preremove.bat
1818
ms-windows/osgeo4w/packages/
@@ -37,4 +37,5 @@ scripts/astyle.exe
3737
doc/CODING.html
3838
doc/CODING.tex
3939
doc/INSTALL.tex
40+
scripts/Debug
4041
scripts/RelWithDebInfo

0 commit comments

Comments
 (0)
Please sign in to comment.