Ecosyste.ms: OpenCollective

An open API service for software projects hosted on Open Collective.

github.com/Warzone2100/archived-3.1-branch

Archived 3.1 branch of warzone2100 repo. Not for development.
https://github.com/Warzone2100/archived-3.1-branch

Hopefully fix the remaining sporadic lex errors.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10378 4a71c8...

d369633bb81fe6f581616deb768fe8f833084ce8 authored almost 15 years ago
Hopefully fix the remaining sporadic lex errors.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10380 4a71c877-e1c...

73cffe085eebda4ee02dbb7a048e073ad8b2cf48 authored almost 15 years ago
qt: Re-fix Linux builds after "QT: Fix MSVC builds.".

The __STDC_FORMAT_MACROS and __STDC_LIMIT_MACROS must be defined before stdint.h or inttypes.h a...

353193abf810c51ee84ea80443c46ba3f9fca921 authored almost 15 years ago
QT: Fix MSVC builds.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10376 4a71c8...

0ac1a95fb3aac385f931297119d587d75f2492a0 authored almost 15 years ago
Merge remote branch 'origin/master' into qt

Conflicts:
lib/framework/types.h
macosx/Warzone.xcodeproj/project.pbxproj (Unmerged, used qt b...

43926bb2747d5d46a2ea6d933dd45ae33518af04 authored almost 15 years ago
3ds2pie tool update. Belongs to #1553.

- Added PIE3 support.
- Conversion routine has been split into 2 parts, with intermediate PIE str...

1e4ac045828d0135a18a28e7db6f4dd79ab9e145 authored almost 15 years ago
Updated Polish translation by Emdek.

Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@103...

c34cad2de3718943cc27b3fa5e5380bec8bd20f8 authored almost 15 years ago
Make QT branch compilable with MSCV. Patch by Buginator, refined by me.

Additional changes were made to fix debug builds. Current trunk devpkg should be used to avoid mi...

ab3e0dbd1206cba5c7a24bd05a6063a0b458bc73 authored almost 15 years ago
Fix MSVC and MinGW builds. Closes #1694.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10370 4a71c877-e1c...

c8e35d7a29e7e5ce4c5aa88f3f5eaa2cfeac3767 authored almost 15 years ago
Bring the DMG script up to date.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10350 4a71c8...

12565213bff60d9c9f39898c1c3c485fafe6f34f authored almost 15 years ago
qt branch: Fix text on MacOSX by turning off face culling when drawing it. Fix by stwf.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10349 4a71c...

fa3f96b3fae7c4729c8c2cb53d6b9074bc88e8fd authored almost 15 years ago
Copy & paste error

(selecting a droid should be done before setting the structure to NULL)

git-svn-id: https://war...

6aafdfa919c802e098dc886f67db46e979bb8c42 authored almost 15 years ago
Change LOG_ERROR to LOG_FATAL, since people have no visual clue to what is going on if it fails during parsing of the command line / shortcut.

And on Qt we don't output anything if it isn't run inside a terminal.
(though, if we do ever get ...

6428ff2bd7d30ba96b28e63737dbf6d5bfdc5ba1 authored almost 15 years ago
Dump out levelname as part of the screen shot name now.

2.3: r10365

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10368 ...

799e10f17a67b0f18d12d440d07935362ce70c57 authored almost 15 years ago
add 'showlevelname' command to toggle on/off the levelname displayed on the screen. Default is on (to help people know what level they are on).

Also don't make 'showfps' or 'showlevelname' require user to enter "cheat" mode to use.

2.3: r1...

c0d626d790175df9e40691dd891bf8841f8dd84d authored almost 15 years ago
adding ground shield and plasma artillery.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10353 4a71c877-e1c...

c01e01aeb59e1a71b24ef57492257cad2eb16303 authored almost 15 years ago
adding laser sat and incendiary mortar.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10357 4a71c877-e1c...

968b77770efe2125a4d55914e556c5da8a38f18e authored almost 15 years ago
- Use additive blending instead of alpha blending for construction/deconstruction lines (regression from 2.3).

- Use Vector3f instead of superfluous CLIP_VERTEX in pie_TransColouredTriangle().

git-svn-id: ht...

0b39df6e6f07757344fafac910dcad5741542358 authored almost 15 years ago
Parser before lexer.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10355 4a71c877-e1c...

0d52935d47730b56193921328d0c21d9c690946c authored almost 15 years ago
Adding new Button Textures

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10360 4a71c877-e1c...

7d3780f99bc5a4cb83369d83dfa9bff2a32dbd49 authored almost 15 years ago
Make sure all templates get all weapons. This hopefully fixes ticket:1687 ie the cyborg leg issue.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10351 4a71c877-e1...

b91106079f0ac24082348ca31f4d1ddd8ce8eca6 authored almost 15 years ago
When cheating droids with ctrl+o menu, notify AI scripts about it so that they can assign jobs to this new droid.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10348 4a71c877-e1...

0ca00ffa44e9f2300562dbe6377c23d0c2e6d811 authored almost 15 years ago
Change zooming of radar so that it uses fixed point (4.4) uint8_t's instead of floats (we're using 8-bit ints because the savegame format requires it).

Fixes a bug causing zoom levels not to be saved correctly. Also fixes a bug reported in this foru...

0c19402d8b8de2bfc0d1d66b903f7ae0f72fe3d8 authored almost 15 years ago
Add better documentation on how .moc files work.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10345 4a71c8...

a1d02bebcf37b830ccdeae3e5e83bdfb2a61e149 authored almost 15 years ago
Moc the code in new and interesting (not to mention better) ways.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10342 4a71c8...

5e50d179a872f93c94de489c06db841da2bd4544 authored almost 15 years ago
Hopefully get rid of lex errors.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10343 4a71c877-e1c...

fe879881ed39f023d8c9c651e67e8341a28f668b authored almost 15 years ago
Make the build scripts more sane.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10341 4a71c877-e1c...

e64cfe21a2aebeb25b1320f71dc8c1de7abdfeb5 authored almost 15 years ago
Fix Mac builds for Qt.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/qt@10340 4a71c8...

29ba2abd0ae702e29a585addffcf0c066daf9d8c authored almost 15 years ago
Fix the NN project file.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branches/newnet@10339 4a...

fd36d0e9610cbdfec382450a20c8bf9b9fbc907c authored almost 15 years ago
Put nettypes.h back into all the places it was.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10337 4a71c877-e1c...

df9fbfa898e780abe70e80fedad624c85fbb0123 authored almost 15 years ago
Merge remote branch 'origin/master' into qt

Conflicts:
configure.ac
macosx/Warzone.xcodeproj/project.pbxproj
macosx/configs/QuesoGLC-All....

2f0c60e78914aee7c0c567b4986b57d6fdb02ead authored almost 15 years ago
newnet: Don't resort to sorting pointer addresses, if two objects are in exactly the same place.

9b17059e109667b65ff30983082369eb6b7ce3d2 authored almost 15 years ago
Merge remote branch 'origin/master' into newnet

Conflicts:
lib/netplay/Makefile.am
lib/netplay/netplay.c
macosx/Warzone.xcodeproj/project.pbx...

8573291c686ef4cb9cf5ce7c9470d7a605f33fae authored almost 15 years ago
Important Missile balance fix

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10333 4a71c877-e1c...

975352a705c9f6762141f0ba39186de33ecf19a7 authored almost 15 years ago
Squelch control reaches end of non-void function warning.

50b41a9a64a6a28c82cd8d8d5a4dc6befff427f5 authored almost 15 years ago
Fix weird structure orientations after synching structures.

Was broken in svn -r10052.

f33656af6017f43934888c95f3dd0cf670f9c9f1 authored almost 15 years ago
Write from a separate thread, to avoid deadlocks were all players are stuck in writeAll.

acaa934203e9c7a78a8a34a14e8d4c65b5f33f63 authored almost 15 years ago
pie file fixes and other updates

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10324 4a71c877-e1c...

886dd10983fc174c009044993444442d52397acd authored almost 15 years ago
Port grabTrucksAndBuild() function over from semperfi and use this to implement usage of pickDroidStructLocation in default AI.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10327 4a71c877-e1...

72123da59d81e8d11d12c5776eb767693bdfebf4 authored almost 15 years ago
Add new AI script function that gives position to build a structure while checking that

a given droid can build it. This is used to fix ticket:1626 where a power generator
could not be ...

4e41e8fe5856ae787a979842efb780ccf2dd0343 authored almost 15 years ago
semperfi: Utilize new script function pickDroidStructLocation(). Fix grab trucks ranges in many cases.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10326 4a71c877-e1...

60ecdc82c0cbad9332b92786719faf149d37d534 authored almost 15 years ago
Add netsocket.cpp to the xcode project and separate out the miniunp stuff.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10321 4a71c877-e1c...

7b5260eb783c2a34c3bb0201e54dbcf08b1167bc authored almost 15 years ago
Rename hton functions to make mac happy. (Re: last refactor commit.)

447e5b048a9c752e0b9562a96f93201576d0b00c authored almost 15 years ago
Use isFlying instead of isVtolDroid for checking AA targets. AA can now also shoot down transports.

fcaf753f0d797ce6a60dad65b0a1aa8dca0a8f35 authored almost 15 years ago
Refactor part of lib/netplay/netplay.c into lib/netplay/netsocket.cpp.

9de2f5c0c7edfbb7ade0d22f7c63e524ba337241 authored almost 15 years ago
Include/declaration cleanup for src/mechanics.c/h.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10303 4a71c877-e1c...

6a92129b3c84d69d5ff321e193f4088a6ba7934f authored almost 15 years ago
Include/declaration cleanup for src/multistat.c/h.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10310 4a71c877-e1c...

ae805fe053e7559aa63b336ce4c21bf1282b6b62 authored almost 15 years ago
Slight revert of r10262.

Problem is, when you exit the game without going through the 'quit' menu, we don't clean up corre...

6e71ef8c6868ddc55d9ce58b7afadd93241fa9c3 authored almost 15 years ago
Translations now are fully working on the mac! ☺

Credit to stwf for finding this fix.

fixes ticket: 927

git-svn-id: https://warzone2100.svn.sou...

a0bae4f5191ff8527f8281d9ee8a6c836ce9c892 authored almost 15 years ago
Updated Spanish translation by Saberuneko.

Closes #1684.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@103...

4e6da59d5c7c07fc3da19a1b0bad98ea063979a0 authored almost 15 years ago
Fix building with clang.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10302 4a71c877-e1c...

20ad2c7e20f656b184b235c3f2b7fbdda928dde4 authored almost 15 years ago
Include/declaration cleanup for src/message.c/h.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10308 4a71c877-e1c...

7bf36e0ffc7609053cc900e2473be9a015904181 authored almost 15 years ago
Avoid any cet checks we can get rid of.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10298 4a71c877-e1c...

d86d7f750b34ac7c8a441da2b42639107149970e authored almost 15 years ago
Include/declaration cleanup for src/mapdisplay.c/h.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10300 4a71c877-e1c...

4aaa77378c34a396b2e62f70d224453b86e092cc authored almost 15 years ago
Revert trunk .pies back to PIE2 format.

This will allow PieSlicer to open them again without manual preparations and free PIE3 format for...

bc80e9b20f0600e9646d274d15f2d0656543d162 authored almost 15 years ago
Remove 256 scale value from texture matrix. Closes #1678.

PIE3 format will expect 0.0-1.0 floating points in texture coordinates values.
PIE2 and IMG(GUI t...

c1beb1f42b8adc30d8d1aa33cf2ac32e4760ae2c authored almost 15 years ago
Update simplipie a bit, so it will produce PIE2 compatible models.

It should follow verbose switch for non-error output.

git-svn-id: https://warzone2100.svn.source...

53464e236f304a3a7f9ca1a50d7f289ca4e25649 authored almost 15 years ago
Remove useless no-op check in pick-a-tile function.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10294 4a71c877-e1...

1c4abc62118b70d589ab998003849a3d784a731e authored almost 15 years ago
Port over some changes from semperfi to trunk AI: Fix bug in build on nearest oil derrick code that meant that we skipped some oil

fields. Fix cases where other events would snatch trucks helping to build something to build some...

a3afb0da5172fa2202d867bf895b2e496109ecad authored almost 15 years ago
Update the msgfmt setup script.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10290 4a71c877-e1c...

d7c29c6899b1c596051b7593aaa886f485df0d2f authored almost 15 years ago
Clean up the .xcconfig files.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10288 4a71c877-e1c...

23a369df4c332b6b7f5f5b2773effe4cdf31422c authored almost 15 years ago
newnet: Add floating point consistency flags to icc build.

f6ca9df680349dd1582de6b4381aabfdf745a730 authored almost 15 years ago
newnet: Assert on broken float primitive datatype.

468f3936cbb4a97f78367807edcf69f998522902 authored almost 15 years ago
newnet: Don't syncDebug floats directly.

Needed due to different sprintf implentations.

8c7a25e6663c59fe9d3f1d7dd6d11f4f10d7c7b7 authored almost 15 years ago
Update MSVC project files to compile newnet

Added /arch:sse2

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/branch...

66edd6bdb37a483b935b64e2f607bf9eef0f5116 authored almost 15 years ago
newnet: Fix last commit, now it actually compiles.

952a37308dc0c2996fcfba48b27bf9761e4380b9 authored almost 15 years ago
newnet: Do a msvc-compatible dummy-initialisation, to make both msvc and mac happy at the same time. Remove unused structureCheckLastCapacity.

ab7b1f9eddfa08f49af85fa27ef686f67e612b71 authored almost 15 years ago
Merge remote branch 'origin/master' into newnet

Conflicts:
src/keybind.c

a0bcd2a8651caed3e954796fc5493098752e39fd authored almost 15 years ago
Change devpkg md5sum to actually match the updated package.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10273 4a71c877-e1c...

1d4c94f89c9bf3ca277df1499a84065e1022dad9 authored almost 15 years ago
I work here.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10275 4a71c877-e1c...

6677813bc32119638da3326e5b7e5cdc0ba7d892 authored almost 15 years ago
Always use the integrated GLee when cross-compiling.

For some reason it seems to use the system's pkg-config info as well, if
someone finds out how t...

ae5fdb635cf52a13c23413039c9d41033801fd8c authored almost 15 years ago
Increase precision of rotations. Patch by bornemix, closes ticket:1679

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10279 4a71c877-e1...

9472b17c3495a9266bdbc51eef92455ed3354d13 authored almost 15 years ago
Remove unused duplicates for projectile .pies. Game engine uses same files from the 'effects' folder.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10272 4a71c877-e1c...

0b8fe4f36ffe4cf611daebf6640263f645f81cb1 authored almost 15 years ago
Remove vidmemc.wrf which is unused and incorrect with current terrain engine. Dataset CAM_1KEVLAR (unused by itself) was the only place where it was mentioned. Any might-be custom campaigns should switch to CAM_1.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10269 4a71c877-e1c...

53d7ad84c406e89b2b000f11728ff46eb7fd3e38 authored almost 15 years ago
Update translations.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10270 4a71c877-e1c...

f143626d118f68c9a97776db386ed88650140ae1 authored almost 15 years ago
Updated Polish translation by Emdek.

Closes #1347.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@102...

52c4dd1ed4418bc3f3452cb8f9181ca81c70bb53 authored almost 15 years ago
newnet: Display icon on desynch or on waiting for players.

Saves having to look at console output to check that the game is in synch.

239e4e450d5086e1db76520d9e6e5f860561072d authored almost 15 years ago
newnet: Remove debugSync from checkPower, which doesn't change game state. Don't require power in edit menu.

a2f7e46f4f686ab1edfa1c973fac5b79ac0af0e4 authored almost 15 years ago
Fix mem leaks concerning Visibility

2.3: r10248

refs ticket:1673

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warz...

01fee22afecd6387bf3cafb330910af48b16552c authored almost 15 years ago
Fixes 'clone wars' to use real templates found using custom lookup routines using aName instead of pName, since pName is unknown.

This makes it work for testing multiple units quick in MP games.

closes ticket:1668

git-svn-i...

c28cad6b88ef9873001f8c15d774c27dd11742a3 authored almost 15 years ago
Cleanup main so we only have 1 atexit() call for our system shutdown routine, instead of hiding multiple shutdown routines using atexit() for each.

Currently, we have 1 atexit for our main shutdown routine, and 1 atexit call for the exception h...

19696a3f166e02a5bc9a2397d2e311e923a2bac6 authored almost 15 years ago
Add new routines for MSVC that allows us to toggle the allocation tracking.

Currently, it is only used in debug builds for strdup().
For release builds, we use _strdup().

...

584c4f1aee9326393d5031aa6d364e3849632635 authored almost 15 years ago
Fix mem leaks concerning apCompLists

2.3: r10247

refs ticket:1673

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzo...

701991017833f93f99414bf524f0d8869fd1d0ae authored almost 15 years ago
Fix memleak in stars

2.3: r10245

refs ticket:1673

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzo...

d1cd6754380dbcacda4df017bf7d1a2cc4aa2a65 authored almost 15 years ago
Add a simple batch file for MSVC people to delete all the generated parser files, since 'clean solution' doesn't clean everything that was made by bison/flex.

(You can either run it manually, or add it to the Pre-build Event to force it to regenerate thos...

763a6177cbc7b20ab6b807254caeb0dabe5901d9 authored almost 15 years ago
Fix mem leaks concerning screenshots

2.3: r10249

refs ticket:1673

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzo...

90326fcbf0c56f456d8323069bf2d99cffe17ee0 authored almost 15 years ago
Add missing #include(s)

*Note*, all our .c / .cpp files really should have these two includes in it.
#include "lib/framew...

a5f56f679198e65effc8c1bb0907cc200b364c35 authored almost 15 years ago
Fix memleak in stats, and get rid of code that was causing dangling pointers.

2.3: r10246

refs ticket:1673

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warz...

e9f3105719fe9cf2b20bbe1ff771462480e1825a authored almost 15 years ago
GLee search path fix

2.3: r10174

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10253 ...

d82fb0f23b433281e8cdfcfba14abfee1a69dcea authored almost 15 years ago
newnet: Remove leftover stray syncDebugBacktrace() call.

(They cause false alarms if the binary isn't identical.)

9afa507ef03a46a2486bdac177ae7d73147b1394 authored almost 15 years ago
src: Undo a warning squelch, seems to be able to cause build errors for some, somehow.

8653631374e290c5ce59cd50922e4444f35c1d3c authored almost 15 years ago
Remove .svn folders for make dist.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10237 4a71c877-e1c...

d726e372cfb136bbae62d6293507569fc8278c34 authored almost 15 years ago
Miniupnp doesn't need to be translated.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10238 4a71c877-e1c...

5ce0a4cf89a90e1e042a461a190fb66b6497036f authored almost 15 years ago
Updated Italian translation by Alpha93.

Closes #1680.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@102...

da18c7e0abeb0a1f4484c2d567fa435e63af0de1 authored almost 15 years ago
newnet: Avoid using the double type.

b2a73377e69d0fbc010b88b4650684da8acee9cc authored almost 15 years ago
newnet: Make scrCompleteResearch and research all synchronised.

Making scrCompleteResearch synchronised fixes a synch error when a human player gives a droid to...

77868ad9e581cafc77b90f2dde77391aa0d0cb23 authored almost 15 years ago
newnet: Fix crash on desynch, when synchronising structures that haven't been built yet. Move desynch logs to logs/.

329721b1a2b4f154ef752d27cf70f4cef620fd96 authored almost 15 years ago
newnet: Call callback when factories finish building a droid.

AI scripts now seem to build more than just trucks.

d2e6c0b6d17a171438bab1616c6622d585fb93a2 authored almost 15 years ago
qt: Squelch mac warnings and error.

981ffd28f5193c5c4e046e148ab1c8b1d30427b5 authored almost 15 years ago
Merge remote branch 'origin/master' into qt

Conflicts:
lib/framework/wzglobal.h

5094bee45c10e3a683fcb0ea5bbba640a0f91bc0 authored almost 15 years ago