BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0ce5b1 ec3294a)
merged trunk into branch
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 12 Aug 2013 13:05:47 +0000 (13:05 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 12 Aug 2013 13:05:47 +0000 (13:05 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history

diff --cc .gitattributes
Simple merge