projects / moonshot-ui.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: aba063c a080b6c)
Merge branch 'master' of ssh://moonshot.suchdamage.org/srv/git/moonshot-ui into debian
authorSam Hartman <hartmans@debian.org>
Tue, 29 Oct 2013 14:37:48 +0000 (10:37 -0400)
committerSam Hartman <hartmans@debian.org>
Tue, 29 Oct 2013 14:37:48 +0000 (10:37 -0400)
Conflicts:
moonshot-ui.spec.in

1  2 
configure.ac patch | diff1 | diff2 | blob | history

diff --cc configure.ac
Simple merge
Moonshot User Interface