Cyp
|
4a1b5fb543
|
Bump year.
sed -i 's/\(Copyright (C) .*-201\)0\( *Warzone 2100 Project\)/\11\2/' {src,lib/*{,/*}}/*.{c,cpp,h,y,l}
|
2011-02-25 18:50:54 +01:00 |
|
Cyp
|
28f9830a63
|
Merge remote branch 'origin/master' into qt
Conflicts:
lib/framework/SDL_framerate.h
lib/framework/cursors.h
lib/framework/input.h
lib/ivis_common/Makefile.am
lib/ivis_common/piestate.cpp
lib/ivis_common/pietypes.h
lib/ivis_opengl/imd.h
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/piestate.h
lib/ivis_opengl/pietypes.h
lib/sound/audio.h
lib/sound/sound.vcproj
lib/sound/track.h
lib/widget/editbox.cpp
lib/widget/scrap.h
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/Warzone-All.xcconfig
src/Makefile.am
|
2011-01-14 19:26:55 +01:00 |
Per Inge Mathisen
|
67e9635f9f
|
Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart.
|
2010-12-31 22:37:14 +01:00 |
|
Cyp
|
bd6b96315b
|
Merge branch 'cpp' into qtcpp
Conflicts:
lib/framework/Makefile.am
lib/framework/frame.cpp
lib/framework/framework.vcproj
lib/framework/input.cpp
lib/ivis_opengl/piestate.cpp
lib/ivis_opengl/screen.cpp
lib/ivis_opengl/textdraw.cpp
lib/widget/Makefile.am
lib/widget/editbox.cpp
lib/widget/scrap.cpp
lib/widget/widget.vcproj
macosx/Warzone.xcodeproj/project.pbxproj
src/Makefile.am
src/main.cpp
src/makefile.win32
|
2010-12-19 16:51:27 +01:00 |
|
Cyp
|
0646b37603
|
Rename *.c to *.cpp.
|
2010-12-16 23:28:56 +01:00 |