]> mj.ucw.cz Git - libucw.git/commitdiff
projects / libucw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4478e08 2f19509)
Merge branch 'dev-mainloop'
authorMartin Mares <mj@ucw.cz>
Sun, 27 Feb 2011 12:13:18 +0000 (13:13 +0100)
committerMartin Mares <mj@ucw.cz>
Sun, 27 Feb 2011 12:13:18 +0000 (13:13 +0100)
1  2 
ucw/Makefile patch | diff1 | diff2 | blob | history
ucw/default.cfg patch | diff1 | diff2 | blob | history

diff --cc ucw/Makefile
Simple merge
diff --cc ucw/default.cfg
Simple merge
UCW libraries