diff options
author | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-13 03:17:48 +0200 |
---|---|---|
committer | René 'Necoro' Neumann <necoro@necoro.net> | 2010-04-13 03:17:48 +0200 |
commit | 06f03d7aa376c8164eff5068a412e76cf2c0b0a9 (patch) | |
tree | bf54e073cd7fd6e09c08aed2c84374c1e88f3d2d /portato/gui/templates/MainWindow.menu | |
parent | a2cbc2cd786477aaf11784d37687f1c1f9c92e16 (diff) | |
parent | 673edfd36e1d02a629838d3a408155779af50912 (diff) | |
download | portato-06f03d7aa376c8164eff5068a412e76cf2c0b0a9.tar.gz portato-06f03d7aa376c8164eff5068a412e76cf2c0b0a9.tar.bz2 portato-06f03d7aa376c8164eff5068a412e76cf2c0b0a9.zip |
Merge branch '0.14'
Conflicts:
portato/backend/portage/sets.py
Diffstat (limited to 'portato/gui/templates/MainWindow.menu')
0 files changed, 0 insertions, 0 deletions