diff options
| author | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-12-29 18:40:42 +0000 |
|---|---|---|
| committer | Eugenio Favalli <elvenprogrammer@gmail.com> | 2005-12-29 18:40:42 +0000 |
| commit | e8054adfc5d90cab85a147f0134566f56df7691b (patch) | |
| tree | 23be7bcd8d5dc8b789c4e50f03dc2fd02e757d39 | |
| parent | 0781c383bf849358132754f28b16d6fe97f0e7e7 (diff) | |
| download | manaserv-e8054adfc5d90cab85a147f0134566f56df7691b.tar.gz manaserv-e8054adfc5d90cab85a147f0134566f56df7691b.tar.bz2 manaserv-e8054adfc5d90cab85a147f0134566f56df7691b.tar.xz manaserv-e8054adfc5d90cab85a147f0134566f56df7691b.zip | |
Fixed merge conflict as pointed out by Bj�rn.
| -rw-r--r-- | ChangeLog | 1 | ||||
| -rw-r--r-- | tmwserv.dev | 5 |
2 files changed, 1 insertions, 5 deletions
@@ -2,6 +2,7 @@ * src/mapmanager.cpp, src/mapmanager.h, tmwserv.dev,: Forgot a way to access maps. + * tmwserv.dev: Fixed merge conflict as pointed out by Bjørn. 2005-12-28 Bjørn Lindeijer <bjorn@lindeijer.nl> diff --git a/tmwserv.dev b/tmwserv.dev index d106dad9..6288889a 100644 --- a/tmwserv.dev +++ b/tmwserv.dev @@ -1,12 +1,7 @@ [Project] FileName=tmwserv.dev -<<<<<<< tmwserv.dev -Name=tmwserv -UnitCount=17 -======= Name=tmwserv UnitCount=74 ->>>>>>> 1.2 Type=1 Ver=1 ObjFiles= |