github/greenshot
1
0
Fork 0
mirror of https://github.com/greenshot/greenshot synced 2025-08-20 21:43:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'remotes/origin/master' into release/1.2.9

Browse source
This commit is contained in:
Robin 2016-05-24 13:13:48 +02:00
commit 0323705513
276 changed files with 5382 additions and 3666 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Greenshot/Memento/TextChangeMemento.cs
View file

@ -28,7 +28,7 @@ namespace Greenshot.Memento {
/// </summary>
public class TextChangeMemento : IMemento {
private TextContainer textContainer;
private string oldText;
private readonly string oldText;
public TextChangeMemento(TextContainer textContainer) {
this.textContainer = textContainer;
@ -37,7 +37,6 @@ namespace Greenshot.Memento {
public void Dispose() {
Dispose(true);
GC.SuppressFinalize(this);
}
protected virtual void Dispose(bool disposing) {
@ -46,12 +45,6 @@ namespace Greenshot.Memento {
}
}
public LangKey ActionLanguageKey {
get {
return LangKey.none;
}
}
public bool Merge(IMemento otherMemento) {
TextChangeMemento other = otherMemento as TextChangeMemento;
if (other != null) {