| author | Martin Geisler <mg@lazybytes.net> |
| Wed, 23 Dec 2009 20:31:35 +0100 | |
| branch | stable |
| changeset 10132 | ebf69364e80f |
| parent 6512 | 368a4ec603cc |
| permissions | -rw-r--r-- |
adding src/a.c moving src/a.c to source/a.c 1 files updated, 0 files merged, 1 files removed, 0 files unresolved created new head ? src/a.o merging src/a.c and source/a.c to source/a.c 1 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) M source/a.c R src/a.c ? source/a.o