cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 22:50:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3913 from Mloc/tg-changelogmerge

Browse Source 
Fix changelog merging + fix AddToChangelog.exe
This commit is contained in:
Alex
2014-06-13 09:15:52 +01:00
parent 79a08d5efd 42110c3a3b
commit 7eb8eea3f2
4 changed files with 1834 additions and 1830 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+4
View File
@@ -1,2 +1,6 @@
# dmm map merger hook
# needs additional setup, see tools/mapmerge/install.txt
*.dmm merge=merge-dmm
# force changelog merging to use union
html/changelog.html merge=union
html/AddToChangelog.exe
BIN
View File
Binary file not shown.
html/changelog.html
+1828 -1828
View File
File diff suppressed because it is too large Load Diff
tools/AddToChangelog/AddToChangelog/Form1.cs
+2 -2
View File
@@ -190,7 +190,7 @@ namespace AddToChangelog
string[] changelogFile = null;
changelogFile = editBox.Text.Split('\n');
changelogFile = Regex.Split(editBox.Text, "\r\n");
if (changelogFile != null)
{
@@ -218,7 +218,7 @@ namespace AddToChangelog
}
else
{
editBox.Text = String.Join("\n", changelogFile);
editBox.Text = String.Join("\r\n", changelogFile);
ScrollToMarker();
}