]> git.pld-linux.org Git - packages/lyricue.git/commitdiff
projects / packages / lyricue.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6148683 37e0e0a)
Resolve conflict
authorCaleb Maclennan <caleb@pld-linux.org>
Thu, 21 Mar 2013 12:08:55 +0000 (14:08 +0200)
committerCaleb Maclennan <caleb@pld-linux.org>
Thu, 21 Mar 2013 12:08:55 +0000 (14:08 +0200)
1  2 
lyricue.spec patch | diff1 | diff2 | blob | history

diff --cc lyricue.spec
Simple merge
GNU Lyric Display System, client interface
This page took 0.123044 seconds and 4 git commands to generate.