projects / gc-dialer / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1a30f04 b2e01d3)
Merge branch 'master' into qt
authorEd Page <eopage@byu.net>
Thu, 2 Dec 2010 02:54:30 +0000 (20:54 -0600)
committerEd Page <eopage@byu.net>
Thu, 2 Dec 2010 02:54:30 +0000 (20:54 -0600)
Conflicts:
src/constants.py


Trivial merge
Unnamed repository; edit this file to name it for gitweb.