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

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit 5302d45dc6fcb358b752522f10794c62c963d406
Merge: 272c78256e70cc2ff7517c9791fc1ea884ce748b e3ebc413e300f743b759f96061f30e6ff264ce06
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 5 22:41:39 2011 -0300

    Merge commit 'upstream/1.0.0_rc2+nolibs'

diff --combined .gitignore
index fadcf42,ae47087..cde02af
--- a/.gitignore
+++ b/.gitignore
@@@ -1,5 -1,3 +1,5 @@@
 +# Quilt's patches state directory
 +.pc
  # Apple generated directories
  LibreCAD.app/
  LibreCAD.pbproj/
@@@ -8,6 -6,9 +8,9 @@@ Info.plis
  # Unix generated directories (except Apple)
  unix/
  
+ #Doxygen
+ html/
+ 
  # All platforms generated directories and files
  *.qm
  intermediate/
@@@ -22,4 -23,4 +25,4 @@@ plugins.pro.use
  .DS_Store
  
  #pkg files
 -*.pkg
 +*.pkg

-- 
2D CAD system