]> p2p-next.cs.pub.ro Git - cs-p2p-next.git/commitdiff
projects / cs-p2p-next.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f61006e 593e4e4)
solved conflict in p2p-nexteditor.py
authorMarius Sandu-Popa <sandupopamarius@gmail.com>
Fri, 11 Dec 2009 09:46:57 +0000 (11:46 +0200)
committerMarius Sandu-Popa <sandupopamarius@gmail.com>
Fri, 11 Dec 2009 09:46:57 +0000 (11:46 +0200)

Trivial merge
UPB P2P-Next repository