diff options
| author | David Pravec <David.Pravec@danix.org> | 2010-12-24 02:17:29 +0100 |
|---|---|---|
| committer | David Pravec <David.Pravec@danix.org> | 2010-12-24 02:17:29 +0100 |
| commit | 24eada1bf54f973d5bd423ba51d505352321324c (patch) | |
| tree | 7d5a89e6e5bb8492dcf6a2b17d20b471a77d0bbe /bin/stack | |
| parent | 6035549fb7a930a0f0995da7ae696a4dc1ebc548 (diff) | |
| parent | 75e2cbec9eb5132a49446f1b6d563d5f43d007de (diff) | |
| download | nova-24eada1bf54f973d5bd423ba51d505352321324c.tar.gz nova-24eada1bf54f973d5bd423ba51d505352321324c.tar.xz nova-24eada1bf54f973d5bd423ba51d505352321324c.zip | |
merged trunk, resolved trivial conflict
Diffstat (limited to 'bin/stack')
0 files changed, 0 insertions, 0 deletions