[SCM] 2D CAD system branch, master, updated. debian/1.0.0-rc1+nolibs-4-31-g757a168

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit 17ead656433f71848551380abaf8dc7c0456beb8
Merge: bb09dbb5a3fb09f3364ee3c8ddd3cb84a9799054 cc7f123de88efc7a7dffb4fb2f50ca1c2aaa3d99
Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
Date:   Mon Oct 24 20:46:55 2011 -0300

    Merge commit 'upstream/1.0.0_rc4+nolibs'

diff --combined .gitignore
index cde02af,d5c7021..5bd284f
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,3 +1,5 @@@
 +# Quilt's patches state directory
 +.pc
  # Apple generated directories
  LibreCAD.app/
  LibreCAD.pbproj/
@@@ -16,7 -14,7 +16,7 @@@ html
  intermediate/
  Makefile
  qmake_image_collection.cpp
- librecad.pro.user
+ librecad.pro.user*
  *.qch
  *.qhc
  plugins.pro.user
@@@ -25,4 -23,4 +25,4 @@@
  .DS_Store
  
  #pkg files
 -*.pkg
 +*.pkg

-- 
2D CAD system