Changeset [80b8f7b8ab7cb15f551e1d26f59a0693e5597b77] by Thell Fowler
Revision 80b8f7b8ab7cb15f551e1d26f59a0693e5597b77,
committed by Thell Fowler
· February 3rd, 2010 @ 10:59 PM
Merge branch 'tf/LH-35/scintilla-setup-for-testing' into my_master
- tf/LH-35/scintilla-setup-for-testing: projects: introduce console app for SciLexer tests powereditor: move vsprops to common project path scintilla projects: add Shipping configuration
Conflicts:
PowerEditor/visual.net/notepadPlus.8.vcproj
PowerEditor/visual.net/notepadPlus.9.vcproj
notepadPlus.8.sln
notepadPlus.9.sln
scintilla/vcbuild/SciLexer.8.vcproj
scintilla/vcbuild/SciLexer.9.vcproj
http://github.com/almostautomated/npp-community/commit/80b8f7b8ab7c...
17 changed files
-
A
common/VSPropSheets/environment_lib_paths.vsprops -
A
common/VSPropSheets/lib_paths.8.vsprops -
A
common/VSPropSheets/lib_paths.9.vsprops -
A
common/VSPropSheets/submodule_lib_paths.vsprops -
A
scintilla/src/SciLexer-gtest-main.cpp -
A
scintilla/tests/testCharClassify.h -
A
scintilla/vcbuild/SciLexer-gtest.8.vcproj -
A
scintilla/vcbuild/SciLexer-gtest.9.vcproj -
R
PowerEditor/visual.net/environment_lib_paths.vsprops -
R
PowerEditor/visual.net/lib_paths.8.vsprops -
R
PowerEditor/visual.net/lib_paths.9.vsprops -
R
PowerEditor/visual.net/submodule_lib_paths.vsprops -
M
PowerEditor/visual.net/notepadPlus.8.vcproj -
M
PowerEditor/visual.net/notepadPlus.9.vcproj -
M
contrib/hudson-ci/NPPCR-HUDSON-BUILD-TESTS.bat -
M
notepadPlus.8.sln -
M
notepadPlus.9.sln