?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
(merge: d480b05 8641f19)
Merge branch 'master' into baulkterm-dev
commitd5eb4de5adbab676151aaa02545d737ef1da51e1
authorJacob Alexander <hyatt@901Mas.localdomain>
Sun, 7 Dec 2008 19:58:47 +0000 (7 11:58 -0800)
committerJacob Alexander <hyatt@901Mas.localdomain>
Sun, 7 Dec 2008 19:58:47 +0000 (7 11:58 -0800)
treec686ce77106daaa353840ef69aa26356f467fae8tree | snapshot (tar.gz zip)
parentd480b05b0c4c5e53fcdcca3611cdd9de2a22e724commit | diff
parent8641f198d9c2c3666ef5745e5dd8def2e04e5ec9commit | diff
Merge branch 'master' into baulkterm-dev

Conflicts:
src/Widgets/BaulkTerm/qtermwidget/Vt102Emulation.cpp
src/Widgets/BaulkTerm/wrapper/baulkterm.cpp
src/Widgets/BaulkTerm/wrapper/main.cpp
src/Widgets/BaulkTerm/wrapper/baulkterm.cpp diff1 |  diff2 |  blob | history
Baulk is a cross-platform native application tiling management tool written in Qt4. An emphasis is made on making all major components a separate dynamic library, for modularity.