]> git.pond.sub.org Git - empserver/commitdiff
projects / empserver / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 845fb26 13d0fc7)
Merge branch 'master' into hvy-metal-2
authorMarkus Armbruster <armbru@pike.pond.sub.org>
Wed, 7 May 2008 08:36:54 +0000 (10:36 +0200)
committerMarkus Armbruster <armbru@pike.pond.sub.org>
Wed, 7 May 2008 08:38:52 +0000 (10:38 +0200)
Merge up to v4.3.14.  No functional change.

1  2 
src/lib/commands/mfir.c patch | diff1 | diff2 | blob | history

diff --cc src/lib/commands/mfir.c
Simple merge
Markus's Wolfpack Empire tree