summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Initial BungeeCord support.madmaxoft2014-09-171-0/+9
| | | | Ref.: #1392
* Spawn exp if you break a mob spawner.Howaner2014-09-121-3/+3
|
* Added Y-wise asserts to signs.Mattes D2014-09-061-0/+1
| | | | This should help detect #1313's second case.
* Fixed 1.7.2 login packet reading.Mattes D2014-08-211-1/+5
| | | | Fixes #1317.
* Merge pull request #1339 from mc-server/HooksSTRWarrior2014-08-201-28/+70
|\ | | | | Added HOOK_SERVER_PING
| * Renamed a_Motd to a_ServerDescription.Howaner2014-08-201-3/+3
| |
| * Added a_ClientHandle to the HOOK_SERVER_PING hook.Howaner2014-08-201-2/+2
| |
| * Cleaned up code.Howaner2014-08-201-1/+0
| |
| * Added HOOK_SERVER_PINGHowaner2014-08-201-28/+71
| |
* | Merge pull request #1296 from mc-server/LuaAPIFranz Reiter2014-08-121-1/+6
|\ \ | |/ |/| Added SetDoDaylightCycle() and IsDaylightCycleEnabled() to cWorld.
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-1/+6
| |
* | cProtocol172: Check return values.madmaxoft2014-08-111-4/+9
|/ | | | Fixes CID 43489, CID 43490, CID 43491, CID 43493, CID 66410, CID 66411, CID 66416, CID 66417, CID 66418, CID 66419, CID 66420, CID 66421, CID 66422, CID 66423, CID 66424, CID 66425, CID 66429, CID 66430, CID 66431
* Fixed #1286Howaner2014-08-041-1/+1
|
* Changed properties for-loop.Howaner2014-08-041-1/+1
|
* Fixed skins in mc 1.7.9/1.7.10Howaner2014-08-031-6/+5
|
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-011-3/+3
|\ | | | | Name to UUID
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-311-4/+4
| |\
| * | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-301-3/+3
| | |
* | | Renamed functions and added beacon json saving.Howaner2014-07-311-2/+2
| | |
* | | Added beacon.Howaner2014-07-301-0/+15
| |/ |/|
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-221-9/+9
|\| | | | | | | | | | | | | | | Conflicts: src/Chunk.cpp src/Entities/Player.cpp src/Root.cpp src/World.cpp
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-1/+1
| |
| * Fixed spaces after commas in protocol data.madmaxoft2014-07-191-7/+7
| | | | | | | | The JSON data is well-formatted with spaces, too; we can afford to waste the few bytes.
| * Fixed style: spaces after commas.madmaxoft2014-07-191-1/+1
| |
* | Fix failed merge and other issuesTiger Wang2014-07-181-1/+1
| |
* | Merge branch 'master' into portalsTiger Wang2014-07-181-49/+60
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Blocks/WorldInterface.h src/ClientHandle.cpp src/ClientHandle.h src/Entities/Player.cpp src/Entities/Player.h src/Generating/FinishGen.cpp src/Protocol/Protocol.h src/Protocol/Protocol125.cpp src/Protocol/Protocol125.h src/Protocol/Protocol16x.cpp src/Protocol/Protocol16x.h src/Protocol/Protocol17x.cpp src/Protocol/Protocol17x.h src/Protocol/ProtocolRecognizer.cpp src/Protocol/ProtocolRecognizer.h src/Root.h src/World.cpp
| * Fixed tabs used for alignment.madmaxoft2014-07-171-3/+4
| |
| * Basic style fixes.madmaxoft2014-07-171-1/+1
| |
| * Normalized comments.madmaxoft2014-07-171-32/+32
| | | | | | | | | | This was mostly done automatically and then visually inspected for obvious errors. All //-style comments should have a 2-space separation from the code, and 1 space after the comment sign.
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-1/+12
| |\ | | | | | | Skins
| | * SuggestionsTiger Wang2014-07-161-2/+5
| | |
| | * Store properties as Json::ValueTiger Wang2014-07-161-6/+2
| | |
| | * Player properties are now retrievedTiger Wang2014-07-141-1/+13
| | |
| * | Fixed MSVC warnings in SoundEffect functions.madmaxoft2014-07-131-7/+3
| | |
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-5/+9
| |/
| * Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-091-1/+1
| |\ | | | | | | Fixes to projectiles and the undead
| | * Crash and compile fixTiger Wang2014-07-041-1/+1
| | |
| * | Fixed respawningTiger Wang2014-06-291-3/+3
| | | | | | | | | | | | * Fixes #1103
| * | Send statistics to the player, when he logged in.Howaner2014-06-291-2/+1
| | |
| * | Added generic entity-collecting.Mattes D2014-06-271-2/+2
| |/ | | | | | | | | Now any cEntity can be collected, not only cPickups. This should help PR #1098.
* | Portals animate and delay correctlyTiger Wang2014-06-121-4/+4
| |
* | Merge branch 'master' into portalsTiger Wang2014-06-101-1/+10
|\| | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/Player.cpp src/Entities/Player.h src/Protocol/Protocol125.cpp src/Protocol/Protocol17x.cpp
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-3/+12
| | | | | | | | Fixes #1039, fixes #851
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-1/+2
|\|
| * Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
| | | | | | | | The code would fail if a message is sent to a player not yet added to a world.
* | Implemented end and nether portalsTiger Wang2014-05-311-2/+2
|/
* cCompositeChat message type is now formattedTiger Wang2014-05-191-1/+1
|
* Added client translation to achievementsTiger Wang2014-05-191-0/+29
|
* cEntity::Killed(cEntity *) Handler; Achievement triggers; cPlayer::AwardAchievement()andrew2014-05-121-5/+1
|
* Statistic Managerandrew2014-05-111-7/+41
|
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-091-9/+9
|
* Change m_RepairCost to int.Howaner2014-05-071-2/+2
|
* Add repair cost to cItem, add custom name to NBTChunkSerializer and fix anvil bugs.Howaner2014-05-071-0/+11
|
* Fixed warnings in ClientHandle.madmaxoft2014-05-011-1/+1
|
* Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-291-2/+3
|
* Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.madmaxoft2014-04-291-1/+1
|
* Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-281-1/+1
|\ | | | | Add entity invulnerable
| * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-281-8/+1
| | | | | | This reverts commit d50f8f6f11f69e7e1e56be92fb2d72a5014a3e34.
| * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-261-1/+8
| |
| * FixesHowaner2014-04-261-1/+1
| |
* | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-281-0/+2
|\ \ | | | | | | Totally refactored ProjectileEntity.h, splitting up into several files.
| * | Fixed projectile source filenames, indentationsarchshift2014-04-281-2/+2
| | |
| * | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | |
| * | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| |/
* / Another attempt at #889.madmaxoft2014-04-271-3/+5
|/ | | | The packet was being sent after the state was adjusted, so another thread *may* have sent another packet in the meantime.
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-37/+48
|\ | | | | | | | | Bug fixes and optimizations. We need to visit the API functions and check that they return only those values expected. `cWorld::CreateProjectile()` seems affected, too, by the same issue of ToLua returning extra values. In the cleanest form, these functions will need moving to ManualBindings.cpp
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-24/+217
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Authenticator.cpp src/ClientHandle.cpp src/Entities/Minecart.cpp src/Protocol/Protocol17x.cpp
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-181-37/+48
| | |
* | | Merge branch 'master' into Enchantingdaniel09162014-04-181-5/+131
|\ \ \ | | |/ | |/|
| * | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
| | | | | | | | | | | | This is to help hunt #889.
* | | Merge branch 'master' into Enchantingdaniel09162014-04-161-19/+86
|\| |
| * | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-151-0/+7
| | |
| * | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-141-22/+40
| | | | | | | | | | | | Server works both in online and offline modes with 1.7.9.
| * | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-141-4/+10
| | | | | | | | | | | | 1.7.9 client works with these changes in offline mode.
| * | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176madmaxoft2014-04-141-1/+1
| |\ \
| | * | Fixed mistakedaniel09162014-04-131-1/+1
| | |/
| * / Initial 1.7.6 protocol support.madmaxoft2014-04-141-0/+36
| |/ | | | | | | Doesn't work yet because of missing UUIDs.
* | Bug fixesdaniel09162014-04-141-3/+0
| |
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-071-64/+614
|\|
| * Fixed format string mismatch.madmaxoft2014-04-041-1/+1
| |
| * More Clang warning fixes in the protocols.madmaxoft2014-04-041-1/+1
| |
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-041-2/+2
| |
| * Protocol: Wither metadataandrew2014-03-251-0/+10
| |
| * Plugins can set flying speed.madmaxoft2014-03-201-2/+1
| |
| * Rewritten player speeds to be relative unit-less.madmaxoft2014-03-201-3/+4
| | | | | | | | Value of 1 means "default speed", 2 means "double the speed", 0.5 means "half the speed". This allows for easier plugins and is more future-proof.
| * Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-121-6/+6
| |
| * Fixed a load of format string errorsTycho2014-03-111-3/+3
| |
| * Fixed format errors in protocolTycho2014-03-111-3/+3
| |
| * Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-25/+52
| |\ | | | | | | Ballistic firework missiles
| | * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-1/+15
| | |\ | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| | * | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-25/+52
| | | | | | | | | | | | | | | | + Added fireworks
| * | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-091-1/+9
| |\ \ \ | | | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| | * | | Adjusted style of switch/caseJan-Fabian Humann2014-03-091-15/+5
| | | | |
| | * | | Changed if-else to switch-caseJan-Fabian Humann2014-03-081-13/+11
| | | | |
| | * | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-081-1/+21
| | | |/ | | |/|
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-2/+2
| | | |
| * | | WarningsTycho2014-03-071-1/+1
| |/ /
| * / Add Flower PotsHowaner2014-03-071-1/+15
| |/
| * Manual merge (Fixed conflicts)andrew2014-02-201-3/+198
| |\
| | * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+15
| | |\ | | | | | | | | Add Skulls/Heads to MCServer
| | | * Rename SkullEntity to MobHeadEntityHowaner2014-02-191-9/+9
| | | |
| | | * Add break to Protocol17x.cpp and use new comment delimiterHowaner2014-02-191-0/+1
| | | |
| | | * Add Skulls/HeadsHowaner2014-02-171-0/+14
| | | |
| | * | Merge branch 'master' into itemframesTiger Wang2014-02-181-0/+15
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/Entities/Entity.h src/WorldStorage/NBTChunkSerializer.cpp
| | | * | Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+15
| | | |/ | | | | | | | | | | | | + Implemented paintings
| | * | De-breaked stuffTiger Wang2014-02-181-2/+0
| | | |
| | * | Implemented item frames, a part of #689Tiger Wang2014-02-181-2/+14
| | |/ | | | | | | | | | | | | + Implemented Item Frames * Fixed Pitch and Yaw being wrongly flipped in the protocol (XOFT!)
| | * Add Locale to ClientHandleHowaner2014-02-161-0/+2
| | |
| | * Set max. Players in the Tablist to 60Howaner2014-02-161-1/+1
| | |
| | * Implemented cCompositeChat.madmaxoft2014-02-151-0/+153
| | | | | | | | | | | | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
| * | Map decorators; Map clientsandrew2014-02-181-0/+20
| | |
| * | Implementation of in-game mapsandrew2014-02-131-0/+35
| |/
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\ | | | | | | | | | | | | | | | | | | Conflicts: src/Root.cpp src/Root.h src/World.cpp
| | * Improved the signedness conversion.madmaxoft2014-02-051-2/+2
| | |
| | * Protocol 1.7: Fixed a signed / unsigned comparison warning.madmaxoft2014-02-041-2/+2
| | |
| * | Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-4/+4
| |\| | | | | | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| | * Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | | | | | | | | | | | That should fix #644 on RasPi.
| | * Improved Type safety of eBlockFaceTycho2014-02-041-2/+2
| | | | | | | | | | | | May Fix #640
| * | Fixed a bunch of MSVS warningsTiger Wang2014-02-051-1/+2
| |/ | | | | | | | | * Possibly also fixed some bugs with pathfinding and TNT, though unlikely
| * Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
| | | | | | | | Fixes #598.
| * Protocol 1.7: Encryption is enabled only with auth.madmaxoft2014-01-291-1/+1
| |
| * Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-281-3/+99
| | | | | | | | This is for testing purposes only, to find bugs in the encryption. Once the encryption is deemed stable, it will be enabled only for servers with enabled Authentication.
| * Fixed client packet parsing.madmaxoft2014-01-261-12/+33
| | | | | | | | | | When the packet wouldn't fit the current buffer, the server would mis-parse the next packet. This was the cause for #541. Also modified comm logging, now each direction can be turned on separately.
| * Merged branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-251-0/+83
| |\
| | * Comm logging is available in both Debug and Release modes.madmaxoft2014-01-251-10/+16
| | |
| | * Protocol17: Comm logging shows the data left over from previous parse.madmaxoft2014-01-251-2/+15
| | |
| | * Added per-connection comm logging in debug mode.madmaxoft2014-01-241-0/+64
| | | | | | | | | | | | It is meant for debugging only, so it is compiled only into debug mode. It is activated by starting the server with "/logcomm" parameter.
| * | PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-231-4/+4
| |/
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-4/+72
| |\
| | * Fix a crash but somewhere...Alexander Harkness2014-01-201-2/+1
| | |
| * | Scoreboard SendTo()andrew2014-01-211-3/+3
| | |
| * | Scoreboard protocol supportandrew2014-01-211-0/+40
| | |
* | | Some updates for enchanting (2)daniel09162014-01-311-13/+4
| | |
* | | removed hook from enchanting commitdaniel09162014-01-241-1/+1
| | |
* | | Some updates for enchantingdaniel09162014-01-241-3/+11
| | |
* | | first changes for enchanting (not finished)daniel09162014-01-201-0/+17
| |/ |/| | | | | | | | | | | | | - added enchanting table block handler and added it to the blockhandler - added enchanting window - drop item in the slot 0 when the player close the window - added enchanting packet (1.7 only) - some more...
* | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-191-2/+3
|\ \ | | | | | | Enchantments fix
| * | Switched EnchantmentSerilizer to namespaceTycho2014-01-191-2/+2
| | |
| * | Spilt Writing of Enchantments to seperate classTycho2014-01-191-2/+3
| |/ | | | | | | | | | | | | Created a new class cEnchantmentSerializer to serilize Enchantments to NBT. This breaks a dependecy chain between cChunkGenerator and cWorld. cEnchantmentSerializer is seperate from NBTWriter as it needs to access private members of cEnchantments so having it seperate reduces the spread of the frein modifier
* | Removed unneeded paramtersTiger Wang2014-01-191-5/+13
| |
* | Changed SendBlockEntity format slightlyTiger Wang2014-01-191-4/+39
| | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
* | Improved command blocksTiger Wang2014-01-191-0/+25
|/ | | | | | | * Their command and previous output are displayed on the client * They have a BlockHandler implementation, so you can't place blocks on them anymore + As a side effect, implemented UpdateBlockEntity
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-2/+17
|\ | | | | Added cWorld::SpawnMinecart.
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-6/+6
| |
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+16
| |
* | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-171-5/+55
|\ \
| * | Changed newline character because of issuesTiger Wang2014-01-161-3/+3
| | |
| * | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-161-28/+36
| |\ \
| * | | Implemented custom names and loreTiger Wang2014-01-151-5/+55
| | | | | | | | | | | | | | | | | | | | | | | | + Added custom names and lore + Added saving and loading + Added writing and parsing of NBT
* | | | Protocol 1.7: More output on unknown packets / protocol states.madmaxoft2014-01-171-4/+21
| | | |
* | | | Fixed block break packet numberTiger Wang2014-01-161-1/+1
| | | |
* | | | Protocol 1.7: Unknown packets are dumped to log in Debug mode.madmaxoft2014-01-161-1/+14
| |/ / |/| |
* | | Added packet diagnostics to 1.7 protocol.madmaxoft2014-01-161-28/+36
|/ / | | | | | | When the packet is mis-interpreted, a log message is output about the packet type and lengths.
* / Added handshake processing to protocol 1.7.madmaxoft2014-01-131-2/+23
|/ | | | This fixes #495
* Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
|
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-091-0/+12
| | | | It is not yet exported in the API, though.
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-071-1/+1
|\ | | | | Fixed favicons
| * Fixed faviconsTiger Wang2014-01-071-1/+1
| |
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-071-1/+1
|/ | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* Merge pull request #514 from derouinw/masterMattes D2014-01-071-0/+3
|\ | | | | Implement favicon for 1.7.2
| * A few more touch upsBill Derouin2014-01-071-11/+1
| |
| * Implement favicon for 1.7.2Bill Derouin2014-01-071-0/+13
| | | | | | | | | | Favicon data is a png encoded in base64 which is stored in the server and sent in the server response packet
* | Fixed a few MSVC warnings.madmaxoft2014-01-071-1/+1
| |
* | Fixed a few MSVC warnings.madmaxoft2014-01-061-1/+0
|/
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+18
|
* Fixed PlayerAbilities and creativeTiger Wang2013-12-191-10/+3
|
* Fixed player falling through the floor on spawn.madmaxoft2013-12-171-1/+5
| | | | The 1.7 client seems to have math issues with exact coords. Adding 0.001 to the Y coord fixed the problem.
* Fixed player spawning packet.madmaxoft2013-12-151-1/+1
| | | | The player was spawned 1.62 blocks below their pos. This fixes #323.
* Moved reading flags to the protocol.STRWarrior2013-12-151-1/+19
|
* Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-2/+10
|
* Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-141-0/+24
|\ | | | | Entity Effects
| * Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-141-0/+24
| |
* | Removed leftover debugging messages from cProtocol172.madmaxoft2013-12-141-4/+0
|/
* Fixed threading issues affecting cProtocol172.madmaxoft2013-12-131-163/+163
|
* Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
|
* Fixed tabcompletion packet, fixes #356Tiger Wang2013-12-081-8/+4
|
* Fixed falling block metas, fixes #406Tiger Wang2013-12-081-1/+1
|
* Renamed animation functionTiger Wang2013-12-071-2/+2
| | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
|
* Switched to using provided ReadItem function.Samuel Barney2013-12-021-17/+3
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Removed stray printf.Samuel Barney2013-12-021-1/+0
|
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+15
| | | | | Conflicts: VC2008/MCServer.vcproj
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+12
| | | | | Conflicts: GNUmakefile
* Moved source to srcAlexander Harkness2013-11-241-0/+1917
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-31 14:54:00 +0100