Backporting git updates for 3.0 branch.

This commit is contained in:
Bryan Petty
2015-11-15 21:45:07 -07:00
parent 6ed2b8527f
commit 1328f7043d
3 changed files with 40 additions and 3 deletions

35
.gitattributes vendored Normal file
View File

@@ -0,0 +1,35 @@
# Windows-specific files that require CRLF:
*.bat eol=crlf
*.bcc eol=crlf
*.dsw eol=crlf
*.gcc eol=crlf
*.props eol=crlf
*.rc eol=crlf
*.sln eol=crlf
*.vc eol=crlf
*.vcproj eol=crlf
*.vcxproj eol=crlf
# Documentation used with Windows installer:
/BuildGit.txt text=auto
/docs/changes.txt text=auto
/docs/licence.txt text=auto
/docs/readme.txt text=auto
/docs/msw/*.txt text=auto
# Unix-specific files that require LF:
*.h.in eol=lf
*.m4 eol=lf
*.sh eol=lf
configure.in eol=lf
Makefile.am eol=lf
Makefile.in eol=lf
makefile.unx eol=lf
config.guess eol=lf
config.sub eol=lf
configure eol=lf
configure.in eol=lf

3
.gitignore vendored
View File

@@ -114,6 +114,9 @@
/demos/poem/poemM5.mcp
/demos/poem/poemM*Data
# /distrib/release/
/distrib/release
# /docs/doxygen/
/docs/doxygen/doxygen.log
/docs/doxygen/out

View File

@@ -1,8 +1,8 @@
------------------------------------------------------------------------
How to build the sources from SVN
How to build the sources from git
------------------------------------------------------------------------
Before building from svn sources under Windows, you need to copy the
Before building from git sources under Windows, you need to copy the
file include/wx/msw/setup0.h to include/wx/msw/setup.h. This is
necessary in order to allow having local modifications to the latter
file without showing it as modified, as it is not under version
@@ -11,4 +11,3 @@ control.
After doing this, please proceed with the build as with any official
release, i.e. follow the instructions in the install.txt file in
docs/gtk, docs/msw and so on.