[Scummvm-cvs-logs] scummvm master -> b0411d50598ab8d4fd96c267058257a66e36f430

[bluegr]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4a66ef231e JANITORIAL: Add [Debug|Release][32|64] to .gitignore
b0411d5059 Merge pull request #346 from tobiatesan/gitignore_msvc11


Commit: 4a66ef231e01df1ba1e5be9350ae32c986285deb
    https://github.com/scummvm/scummvm/commit/4a66ef231e01df1ba1e5be9350ae32c986285deb
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2013-06-27T04:38:24-07:00

Commit Message:
JANITORIAL: Add [Debug|Release][32|64] to .gitignore

MSVC11 seems to be using these as new default when running on x64.

Changed paths:
    .gitignore



diff --git a/.gitignore b/.gitignore
index b834214..a046909 100644
--- a/.gitignore
+++ b/.gitignore
@@ -161,6 +161,10 @@ ipch/
 #Ignore default Visual Studio build folders
 [Dd]ebug/
 [Rr]elease/
+[Dd]ebug32/
+[Rr]elease32/
+[Dd]ebug64/
+[Rr]elease64/
 
 #Ignore Qt Creator project files
 ScummVM.config


Commit: b0411d50598ab8d4fd96c267058257a66e36f430
    https://github.com/scummvm/scummvm/commit/b0411d50598ab8d4fd96c267058257a66e36f430
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2013-06-27T11:42:27-07:00

Commit Message:
Merge pull request #346 from tobiatesan/gitignore_msvc11

JANITORIAL: Add [Debug|Release][32|64] to .gitignore

Changed paths:
    .gitignore