[SCM] 2D CAD system branch, master, updated. debian/2.0.0_alpha1+nolibs-1-11-g5351e4e

[Scott Howard]

The following commit has been merged in the master branch:
commit d9eb0f15224f28930bc57068a51c0e315b0933c3
Merge: 7dc94b0dc5703e3ac3fb62479aa8465ffddc8a4e fcaaaf4511f2fb4c06d0a10c8fdf8b5766ba4a71
Author: Scott Howard <showard at debian.org>
Date:   Sat Mar 3 17:35:40 2012 -0500

    merge from upstream

diff --combined .gitignore
index 5bd284f,2b471b9..dd54421
--- a/.gitignore
+++ b/.gitignore
@@@ -1,28 -1,64 +1,66 @@@
 +# Quilt's patches state directory
 +.pc
  # Apple generated directories
  LibreCAD.app/
  LibreCAD.pbproj/
  Info.plist
  
+ # globs, anywhere
+ *.o
+ *.lo
+ *.la
+ 
+ *~
+ 
+ # filenames, anywhere
+ Makefile.in
+ Makefile
+ .deps
+ .libs
+ generated/*
+ 
  # Unix generated directories (except Apple)
  unix/
  
+ # Win/MSVC generated files and binaries
+ windows/
+ *.ncb
+ *.suo
+ *.idb
+ *.pdb
+ *.dll
+ *.lib
+ *.exe
+ *.exp
+ *.ilk
+ *.rc
+ *.bak
+ # Win/qmake generated project files
+ *.vcproj
+ *.sln
+ 
  #Doxygen
  html/
  
  # All platforms generated directories and files
  *.qm
- intermediate/
- Makefile
+ *generated*
+ Makefile*
  qmake_image_collection.cpp
  librecad.pro.user*
+ librecad2.pro.user*
  *.qch
  *.qhc
- plugins.pro.user
+ plugins.pro.user*
+ ttf2lff.pro.user*
+ PWD
+ scripts/PWD
  
  # Mac store files
  .DS_Store
  
  #pkg files
  *.pkg
+ #vim files
+ *.swp
 -*.orig
++*.orig

-- 
2D CAD system