git://git.novaco.in / electrum-nvc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1cda13a 070d497)
Fix merge conflict
authorMaran <maran.hidskes@gmail.com>
Sat, 16 Mar 2013 20:38:12 +0000 (21:38 +0100)
committerMaran <maran.hidskes@gmail.com>
Sat, 16 Mar 2013 20:38:12 +0000 (21:38 +0100)
1  2 
.gitignore patch | diff1 | diff2 | blob | history
gui/gui_classic.py patch | diff1 | diff2 | blob | history

diff --cc .gitignore
index df26565,df26565..fc596d3
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -4,4 -4,4 +4,5 @@@ lib/icons_rc.p
  build/
  dist/
  *.egg/
--/electrum.py
++/electrum.py
++contrib/pyinstaller/
diff --cc gui/gui_classic.py
Simple merge
Lightweight Novacoin client