Merge branch 'master' into HEAD

git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5430 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d
This commit is contained in:
jriegel 2012-02-02 21:48:46 +00:00
commit b95b89b173
7 changed files with 54 additions and 0 deletions

15
.gitattributes vendored Normal file
View File

@ -0,0 +1,15 @@
#git archive --worktree-attributes --prefix=freecad-0.13/ --output=freecad.tar.gz HEAD
acinclude.m4 export-ignore
autogen.sh export-ignore
build.sh export-ignore
BuildAll.bat export-ignore
BuildRelease.ini export-ignore
BuildRelease.py export-ignore
configure.ac export-ignore
Makefile.am export-ignore
mkinstalldirs export-ignore
package export-ignore
fc.sh export-ignore
UpdateResources.bat export-ignore
*.sln export-ignore
WindowsInstaller export-ignore

6
src/3rdParty/.gitattributes vendored Normal file
View File

@ -0,0 +1,6 @@
ANN export-ignore
atlas export-ignore
CxImage export-ignore
CoinBinding.sln export-ignore
boost.CMakeLists.txt export-ignore
zlib.CMakeLists.txt export-ignore

8
src/Doc/.gitattributes vendored Normal file
View File

@ -0,0 +1,8 @@
sphinx export-ignore
BuildDocDoxy.cfg.in export-ignore
BuildDocDoxyFull.cfg export-ignore
BuildSourceDoc.bat export-ignore
TiddlySaver.jar export-ignore
Document.mm export-ignore
FreeCAD.uml export-ignore
PythonClassModel.uml export-ignore

4
src/Gui/iisTaskPanel/.gitattributes vendored Normal file
View File

@ -0,0 +1,4 @@
tests export-ignore
src.pro export-ignore
config.pri export-ignore
taskpanel.pro export-ignore

1
src/Mod/.gitattributes vendored Normal file
View File

@ -0,0 +1 @@
JtReader export-ignore

2
src/Mod/Mesh/.gitattributes vendored Normal file
View File

@ -0,0 +1,2 @@
GTSAlgos.cpp export-ignore
GTSAlgos.h export-ignore

18
src/Tools/.gitattributes vendored Normal file
View File

@ -0,0 +1,18 @@
embedded export-ignore
encode export-ignore
ImageTools export-ignore
offlinedoc export-ignore
RegExp export-ignore
thumbs export-ignore
FreeCAD_widgets.sln export-ignore
wizard.cpp export-ignore
wizard.h export-ignore
BuildDoc.py export-ignore
BuildDocDoxy.cfg export-ignore
astylerc export-ignore
chm.css export-ignore
examplePy2wiki.py export-ignore
updateTranslations.py export-ignore
updatets.py export-ignore
wiki2chm.py export-ignore
WixFileTool.py export-ignore