[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5+nolibs-1-16-gc106faf

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit e333cde86164d2939840a4510756c2eba447f5da
Merge: c502f731028385fe7449313ceaa940999da1b4d9 a2294784a4ec69e384e553e54613139da9f179e5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jun 17 11:43:50 2011 -0300

    Merge commit 'upstream/1.0.0rc1'
    
    Conflicts:
    	.gitignore
    
    Solved by adding upstream's gitingnore to our gitignore,
    after all there all all files that should be ignored :-)

diff --combined .gitignore
index 845ca06,00eb20c..fadcf42
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,23 +1,25 @@@
++# Quilt's patches state directory
 +.pc
+ # Apple generated directories
+ LibreCAD.app/
+ LibreCAD.pbproj/
+ Info.plist
+ 
+ # Unix generated directories (except Apple)
+ unix/
+ 
+ # All platforms generated directories and files
+ *.qm
+ intermediate/
+ Makefile
+ qmake_image_collection.cpp
+ librecad.pro.user
+ *.qch
+ *.qhc
+ plugins.pro.user
+ 
+ # Mac store files
+ .DS_Store
+ 
+ #pkg files
 -*.pkg
++*.pkg

-- 
2D CAD system