diff options
| author | Ira Rice <irarice@gmail.com> | 2008-12-07 19:44:30 -0700 |
|---|---|---|
| committer | Ira Rice <irarice@gmail.com> | 2008-12-07 19:44:30 -0700 |
| commit | 3aca1f5b4f11a3bb90ecacfb43346a1e2832397d (patch) | |
| tree | 0502d14866767d64ef3e9a89e05a16fda04a7399 /ChangeLog | |
| parent | aef082e6fe4fca268f9bfe401409eb342f82e4af (diff) | |
| download | mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.tar.gz mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.tar.bz2 mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.tar.xz mana-3aca1f5b4f11a3bb90ecacfb43346a1e2832397d.zip | |
Fixed a few files that apparently weren't updated.
Signed-off-by: Ira Rice <irarice@gmail.com>
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 3 |
1 files changed, 0 insertions, 3 deletions
@@ -1,4 +1,3 @@ -<<<<<<< HEAD:ChangeLog 2008-11-01 Bjørn Lindeijer <bjorn@lindeijer.nl> * src/openglgraphics.h, src/openglgraphics.cpp: Made an option around @@ -6143,5 +6142,3 @@ window a shorter. * data/graphics/images/login_wallpaper.png: New login wallpaper by Momotaro. -======= ->>>>>>> a7c21e6f8add37af7412449742ec55c8daa8571a:ChangeLog |