diff options
| author | Brad King <brad.king@kitware.com> | 2013-09-18 18:05:30 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2013-09-20 12:20:01 (GMT) |
| commit | 027a0201b270e582d76c1de94a60c19a2a8e505c (patch) | |
| tree | bbc956f874a4656452e13319f8b2ac1ab0edc498 /Source/cmMakefileLibraryTargetGenerator.cxx | |
| parent | 33055c405ed3b0e1df52c186f0d8a3e878aa88a8 (diff) | |
| parent | 6a47c37ccf7049d5ac3fa6224def8d17ee82c7f5 (diff) | |
| download | CMake-027a0201b270e582d76c1de94a60c19a2a8e505c.zip CMake-027a0201b270e582d76c1de94a60c19a2a8e505c.tar.gz CMake-027a0201b270e582d76c1de94a60c19a2a8e505c.tar.bz2 | |
Merge branch 'test-property-genex' into generate-modern-style
Resolve conflict in Source/cmTestGenerator.cxx by taking "their" side
(test-property-genex). It already accounts for the lower-case change in
"our" side (generate-modern-style).
Diffstat (limited to 'Source/cmMakefileLibraryTargetGenerator.cxx')
0 files changed, 0 insertions, 0 deletions