summaryrefslogtreecommitdiffstats
path: root/src/ClientHandle.cpp (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Fixed basic whitespace problems.madmaxoft2014-07-171-10/+10
| | | | Indenting by spaces and alignment by spaces, as well as trailing whitespace on non-empty lines.
* Merge remote-tracking branch 'origin/master' into potionsmadmaxoft2014-07-171-3/+4
|\
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-3/+4
| |\ | | | | | | Skins
| | * Store properties as Json::ValueTiger Wang2014-07-161-1/+1
| | |
| | * Player properties are now retrievedTiger Wang2014-07-141-3/+4
| | |
* | | Merge branch 'master' into potionsmadmaxoft2014-07-151-30/+7
|\| |
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-131-3/+3
| |/
| * Revert failed fix for #31Tiger Wang2014-07-131-27/+4
| | | | | | | | This reverts commit 69dc9b4c9aea58ebd95e2dbd0205701dfc4ce54e.
* | Merge remote-tracking branch 'origin/master' into potionsarchshift2014-07-101-41/+68
|\| | | | | | | | | | | Conflicts: src/Entities/Player.cpp src/Entities/ProjectileEntity.cpp
| * Unnecessary returnHowaner2014-06-301-2/+0
| |
| * Fixed respawningTiger Wang2014-06-291-2/+2
| | | | | | | | * Fixes #1103
| * Fixed offline UUID generator.Mattes D2014-06-291-2/+4
| | | | | | | | It generated invalid UUIDs, too many hex chars.
| * Send statistics to the player, when he logged in.Howaner2014-06-291-0/+3
| |
| * Merge pull request #1132 from mc-server/RemoveMD5Mattes D2014-06-291-13/+9
| |\ | | | | | | Removed the md5 library, obsoleted by PolarSSL.
| | * Removed the md5 library, obsoleted by PolarSSL.Mattes D2014-06-271-13/+9
| | | | | | | | | | | | Fixes #1130.
| * | Fixed issue with breaking blocks at -1 coordinatesTiger Wang2014-06-281-6/+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.
| * Added cClientHandle::IsUUIDOnline function.madmaxoft2014-06-211-0/+29
| | | | | | | | Ref.: #771
| * Merge branch 'master' into GlobalFixesHowaner2014-06-171-25/+20
| |\
| * | Add more documentation.Howaner2014-06-171-0/+2
| | |
| * | Add comment.Howaner2014-06-171-0/+1
| | |
| * | Revert "Fix right click bugs."Howaner2014-06-171-41/+40
| | | | | | | | | This reverts commit 61b6fdde7553dac6e2d5c5a071b9a13fa0d71b2f.
| * | Fix fire break.Howaner2014-05-281-16/+17
| | |
| * | Fix right click bugs.Howaner2014-05-281-40/+41
| | |
* | | ItemHandler: changed IsDrinkable() to take a short argumentarchshift2014-06-171-3/+4
| | |
* | | Implemented drinkable potions, noeffect entity effect,archshift2014-06-171-3/+3
| | | | | | | | | | | | Clears entity effects on death
* | | Implemented milk, added documentation to Pawn.harchshift2014-06-171-3/+3
| |/ |/|
* | Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-16/+5
| | | | | | | | Fixes #1039, fixes #851
* | Proper fix for long interaction.madmaxoft2014-06-081-7/+14
| | | | | | | | Fixes #1078 and #1038.
* | Fixed bad coordinateworktycho2014-06-041-1/+1
| |
* | Merge remote-tracking branch 'origin/pistonfixes'Tiger Wang2014-06-021-1/+0
|\ \ | |/ |/| | | | | Conflicts: src/Chunk.cpp
| * Hopefully fixed piston duplication issuesTiger Wang2014-05-251-1/+0
| | | | | | | | | | * Fixes #879 * Fixes #714
* | ClientHandle.cpp: Process look before posarchshift2014-05-271-1/+1
| |
* | ClientHandle.cpp: remove redundant codearchshift2014-05-261-22/+2
| | | | | | | | HandlePlayerMoveLook() calls HandlePlayerPos() and HandlePlayerLook() to reduce code redundancy.
* | Revert "Add more move checks"madmaxoft2014-05-261-58/+16
| | | | | | | | This reverts commit 989312c4e7f517ae324e857cb255211e3fd8bb06.
* | Merge pull request #1003 from Howaner/GlobalFixesMattes D2014-05-261-16/+58
|\ \ | |/ |/| Add more move checks
| * Add more move checksHowaner2014-05-161-16/+58
| | | | | | | | | | - Invalid X/Y/Z/Stance check (std::isnan) - Illegal stance - Illegal position (32.000.000 is the world size)
* | Merge pull request #1010 from mc-server/cactidamageAlexander Harkness2014-05-191-2/+3
|\ \ | | | | | | Implemented cacti damage
| * | Implemented cacti damageTiger Wang2014-05-181-2/+3
| | | | | | | | | | | | | | | + Implemented cacti damage * Fixed pickup tossing (PR #994 bug)
* | | Merge pull request #998 from mc-server/StatManagerMattes D2014-05-181-1/+10
|\ \ \ | |/ / |/| | Statistic Manager
| * | Fixed stat serializationandrew2014-05-111-8/+0
| | |
| * | Statistic Managerandrew2014-05-111-1/+18
| | |
* | | Merge pull request #994 from Howaner/GlobalFixesMattes D2014-05-151-17/+80
|\ \ \ | | |/ | |/| Add place/break radius, add dig cancel packet and add item resend on break/place cancel.
| * | Fix compile error.Howaner2014-05-151-1/+1
| | |
| * | Move radius check.Howaner2014-05-151-25/+40
| | |
| * | Rename HandleBlockDigCancel to FinishDigAnimtion.Howaner2014-05-111-3/+3
| | |
| * | Add block place/break distance check.Howaner2014-05-091-0/+21
| | |
| * | Add DIG_STATUS_CANCELLED packet and add item resend, when a block can't place/break.Howaner2014-05-091-17/+44
| |/
* | Merge branch 'master' into SslWebAdminMattes D2014-05-101-5/+32
|\|
| * Simplified the HandleAnvilItemName() code.Howaner2014-05-061-7/+2
| |
| * Changed HandleAnvilItemName() length to size_t in ClientHandle.hHowaner2014-05-051-1/+1
| |
| * Add clicks, exp subtraction, item check, ...Howaner2014-05-051-1/+1
| |
| * Add MC|ItemName plugin message.Howaner2014-05-051-0/+32
| |
| * Merge branch 'master' into redstoneimprovementsTiger Wang2014-05-041-5/+14
| |\ | | | | | | | | | | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp src/Entities/FallingBlock.cpp src/Mobs/AggressiveMonster.cpp src/Simulator/IncrementalRedstoneSimulator.cpp
| | * HOOK_DISCONNECT has cClientHandle as its first parameter.madmaxoft2014-05-021-3/+3
| | | | | | | | | | | | Ref.: #655.
| * | Redstone simulator now directly accesses cChunkTiger Wang2014-04-271-1/+2
| | | | | | | | | | | | | | | | | | * Redstone simulator performance improvements * Added return values to some functions * Minor fixes
* | | Merged branch 'master' into SslWebAdmin.madmaxoft2014-05-011-2/+2
|\ \ \ | | |/ | |/|
| * | More ClientHandle fixes.madmaxoft2014-05-011-2/+2
| | |
| * | Fixed warnings in ClientHandle.madmaxoft2014-05-011-2/+2
| | |
* | | Fixed crashes in the SSL HTTP connection.madmaxoft2014-05-011-1/+2
|/ /
* | Delayed sending the KeepAlive packet for 3 seconds after login.madmaxoft2014-04-291-0/+5
| | | | | | | | This should alleviate #889.
* | Fixed braces.madmaxoft2014-04-281-1/+5
| |
* | Fixed missing return value warning in MSVC.madmaxoft2014-04-281-0/+1
|/
* More small fixes.archshift2014-04-261-9/+9
|
* Moar alignment.archshift2014-04-261-7/+7
|
* Further refactored, Reverted Minecart changearchshift2014-04-261-57/+21
| | | | Other small changes.
* Merge remote-tracking branch 'upstream/master'archshift2014-04-251-1/+1
|\
| * Fix armor in survival mode.Howaner2014-04-241-1/+1
| |
* | Oops, fixed that.archshift2014-04-251-0/+2
| |
* | Refactored SendChat(), placing the message-type formatting into its own function.archshift2014-04-251-84/+78
|/ | | | Removed default case warning in the process.
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-6/+8
|\ | | | | | | | | 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
| * Declared one mutex as mutable in order to allow for const correct get accessors.jfhumann2014-04-191-4/+4
| |
| * Small style changesjfhumann2014-04-181-1/+1
| |
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-9/+53
| |\ | | | | | | | | | | | | | | | | | | | | | 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-8/+10
| | |
* | | Merge branch 'master' into Enchantingdaniel09162014-04-181-1/+1
|\ \ \ | | |/ | |/|
| * | Merge pull request #891 from mc-server/fixesMattes D2014-04-171-1/+1
| |\ \ | | | | | | | | Fixes to redstone & general
| | * | Entities handle chunks properly againTiger Wang2014-04-121-1/+1
| | |/ | | | | | | | | | | | | * Entities properly handle chunks * Changed EntityStatus enums to be less shouty
* | | Removed old includedaniel09162014-04-181-1/+1
| | |
* | | Fixed some Errors (not all)daniel09162014-04-171-7/+10
| | |
* | | Modified many thingsdaniel09162014-04-171-856/+1
| | |
* | | Fixed conflicting enchantments checkingdaniel09162014-04-161-23/+23
| | |
* | | Added deletions from merge conflictdaniel09162014-04-161-0/+875
|/ /
* | Attempted fix for the client crash with the new protocols.madmaxoft2014-04-151-6/+9
| |
* | Implemented the 1.7.6 protocol and authenticator.madmaxoft2014-04-141-8/+22
| | | | | | | | 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-0/+24
| | | | | | | | 1.7.9 client works with these changes in offline mode.
* | Added Yggdrasil Authentication Systemdaniel09162014-04-131-2/+5
|/ | | | Code by Howaner. Fixes/Changes by me.
* Merge branch 'master' into HTTPSizeTmadmaxoft2014-04-041-3/+3
|\
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-041-2/+2
| |
| * Simplified and fixed slabs, fixes #835Tiger Wang2014-03-311-1/+1
| |
* | Fixed All signedness warnings in HTTPServer.cppTycho2014-04-021-1/+1
|/
* Merge pull request #838 from mc-server/lilypadsworktycho2014-03-301-6/+8
|\ | | | | Lilypads
| * Compare for inequality in FACE_NONE checksTiger Wang2014-03-291-3/+3
| |
| * Removed leftover clienthandle codeTiger Wang2014-03-291-10/+6
| |
| * Fixed block interaction rate checkTiger Wang2014-03-281-2/+4
| |
| * Implemented lilypad placementTiger Wang2014-03-231-4/+8
| |
* | Fixed players not updating after world changeTiger Wang2014-03-291-4/+2
|/ | | | Addendum to 6dea7993f2a563a8b3a0746feeb2174922631526
* Merge branch 'Werror' into warningsTycho2014-03-121-3/+0
|\ | | | | | | | | Conflicts: src/Globals.h
| * Merge branch 'master' into WerrorTycho2014-03-121-3/+0
| |\ | | | | | | | | | | | | Conflicts: src/Generating/PieceGenerator.cpp
| | * Unified Vector classesandrew2014-03-111-3/+0
| | |
* | | Fixed a load of format string errorsTycho2014-03-111-1/+1
|/ /
* / Removed Some unnessicary macrosTycho2014-03-101-13/+0
|/
* Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-29/+19
|\ | | | | Ballistic firework missiles
| * != FACE_NONETiger Wang2014-03-091-1/+1
| |
| * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-9/+28
| |\ | | | | | | | | | | | | Conflicts: src/ClientHandle.cpp
| * | Fixed data length issuesTiger Wang2014-03-091-1/+1
| | |
| * | CheckBlockInteractionsRate() fixed & enabledTiger Wang2014-03-091-29/+19
| | |
* | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-091-28/+30
|\ \ \ | | | | | | | | Issue 317: Split cClientHandle::HandleEntityAction() into seperate functions
| * | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-081-28/+30
| | | |
* | | | Merge pull request #775 from worktycho/warningsMattes D2014-03-091-2/+2
|\ \ \ \ | |_|_|/ |/| | | Fixed a few warnings
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-2/+2
| |/ /
* / / Slight plugin messaging changesTiger Wang2014-03-091-0/+13
|/ / | | | | | | | | - Clients are not allowed to register duplicate channels - Clients are not allowed to use channels that were not registered
* | Add data backsending, when the Client interacts a Block and the Interact is cancelled.Howaner2014-03-051-4/+10
| |
* | cBlockInfo now manages the respective cBlockHandlerandrew2014-03-021-3/+3
| |
* | Merge pull request #738 from xdot/masterMattes D2014-03-021-1/+1
|\ \ | | | | | | Refactored global block property arrays
| * | g_BlockXXX => cBlockInfo::XXXandrew2014-03-011-1/+1
| |/
* | Use switch in GetStepSoundHowaner2014-02-281-1/+1
| |
* | Fix Double Slabs, fix Slab Meta and add more things to burnableHowaner2014-02-281-1/+1
|/
* Merge pull request #669 from xdot/masterTiger Wang2014-02-241-0/+27
|\ | | | | Implementation of in-game maps :D
| * Manual merge (Fixed conflicts)andrew2014-02-201-9/+34
| |\
| * | Map decorators; Map clientsandrew2014-02-181-13/+9
| | |
| * | Map item handler; Fixed several bugsandrew2014-02-171-2/+0
| | |
| * | cMap::UpdateRadiusandrew2014-02-151-0/+2
| | |
| * | Send map when selectedandrew2014-02-141-0/+13
| | |
| * | Implementation of in-game mapsandrew2014-02-131-0/+18
| | |
* | | Use the ItemCategorie::IsSword() Method.Howaner2014-02-231-1/+1
| | |
* | | No Sword Block Destroying in Creative ModeHowaner2014-02-231-0/+10
| | |
* | | cClientHandle manages the client-registered plugin channels.madmaxoft2014-02-201-10/+77
| |/ |/| | | | | Fixes #706.
* | Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+8
| | | | | | | | + Implemented paintings
* | Links sent via chat messages are clickable.madmaxoft2014-02-161-8/+14
| | | | | | | | Fixes #658.
* | Add Locale to ClientHandleHowaner2014-02-161-0/+1
| |
* | Implemented cCompositeChat.madmaxoft2014-02-151-1/+11
|/ | | | | This allows plugins to send composite chat messages, containing URLs, commands to run and cmdline suggestions. Fixes #678.
* Merge branch 'master' into playerimprovementsTiger Wang2014-02-091-5/+5
|\ | | | | | | | | Conflicts: MCServer/Plugins/APIDump/APIDesc.lua
| * Improved Type safety of eBlockFaceTycho2014-02-041-5/+5
| | | | | | | | May Fix #640
* | Added sender name to PM if prefixes disabledTiger Wang2014-02-071-1/+1
| | | | | | | | * Also moved the PVP setting into Mechanics
* | Improved chat messaging functionsTiger Wang2014-02-071-6/+108
| | | | | | | | | | | | | | * Moved string manipulation into cClientHandle and therefore... + Added configuration option for prefixes. * Cleaned up code. * Updated documentation for API.
* | Server internally uses new functionsTiger Wang2014-02-061-8/+6
| |
* | Reduced max explosions per tickTiger Wang2014-02-051-1/+1
| |
* | Fixed explosions bugTiger Wang2014-02-051-20/+10
| | | | | | | | * Fixed bug where explosions would sometimes never be sent
* | Fixed a crash bugTiger Wang2014-02-031-8/+2
| |
* | Server now handles join messages alsoTiger Wang2014-02-031-9/+11
|/ | | | * Revised as well hook documentation
* Changed Signiture of OnDiggingTycho2014-02-011-3/+3
|
* Changed Signiture of OnDestroyedByPlayerTycho2014-02-011-3/+4
|
* Changed pointers to referencesTycho2014-02-011-4/+3
|
* Changed signitures of Several BLockHandler MethodsTycho2014-02-011-1/+2
| | | | | | | | | | | | | Changed the signitures of the following to use interfaces: GetPlacementBlockTypeMeta OnPlaced OnPlacedByPlayer OnDestroyed OnNeighbourChanged NeighbourChanged OnUse CanBeAt Check
* Merge branch 'master' into GeneratingBenchmark2Tycho2014-01-261-27/+12
|\ | | | | | | | | | | Conflicts: src/Blocks/BlockRail.h src/World.h
| * Merge pull request #587 from mc-server/mobimprovementsMattes D2014-01-251-1/+1
| |\ | | | | | | Mob improvements & rudimentary artificial intelligence
| | * Two minor changesTiger Wang2014-01-251-1/+1
| | |
| * | Fixed a possible deadlock on client disconnect.madmaxoft2014-01-241-9/+0
| |/
| * Merge remote-tracking branch 'MikeHunsinger/master'madmaxoft2014-01-241-2/+3
| |\
| | * Split TossItem into three Toss functions (Held, Equipped and Pickup)Mike Hunsinger2014-01-231-2/+3
| | |
| * | Command block fixes 2andrew2014-01-231-16/+9
| | |
* | | Refactored cBlockHandler::OnUse and dependentsTycho2014-01-261-1/+4
| | |
* | | First attempt at Implementing InterfacesTycho2014-01-251-1/+1
|/ /
* | Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-211-8/+22
|\|
| * Merge pull request #565 from mc-server/commandblockfixesMattes D2014-01-191-3/+21
| |\ | | | | | | Command block fixes
| | * Removed unneeded paramtersTiger Wang2014-01-191-2/+2
| | |
| | * Changed SendBlockEntity format slightlyTiger Wang2014-01-191-3/+6
| | | | | | | | | | | | | | | * Writing NBT is now in Protocol, not BlockEntity files * Fixed a last output bug
| | * Implemented MC|Brand responseTiger Wang2014-01-191-3/+9
| | |
| | * Improved command blocksTiger Wang2014-01-191-0/+9
| | | | | | | | | | | | | | | | | | | | | * 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
| * | Rewritten SocketThreads for proper shutdown scenario.madmaxoft2014-01-191-5/+1
| |/ | | | | | | This fixes #560 and #390.
* | Scoreboard SendTo()andrew2014-01-211-0/+3
| |
* | Scoreboard protocol supportandrew2014-01-211-0/+30
|/
* Command block fixesandrew2014-01-181-5/+12
|
* Parse the MC|AdvCdm plugin messageandrew2014-01-181-0/+64
|
* Removed obsoleted functionsTiger Wang2014-01-161-2/+2
|
* Implemented Ctrl-Q drop stackTiger Wang2014-01-151-0/+11
| | | | Also fixed an issue with TossItems not respecting count.
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-091-0/+9
| | | | It is not yet exported in the API, though.
* Plugin messages are received and handed to plugins.madmaxoft2014-01-071-0/+9
| | | | Note that MCS doesn't currently handle any channel registrations, this will come later on.
* fixed ClientHandle warningsTycho Bickerstaff2013-12-311-0/+1
|
* Implented BroadcastParticleEffectSTRWarrior2013-12-221-0/+9
|
* Fixed the rest of constructor reorders.madmaxoft2013-12-201-21/+20
|
* Merge pull request #450 from mc-server/redstonefixesMattes D2013-12-191-4/+26
|\ | | | | Multiple fixes
| * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-3/+3
| |
| * Fixed 1.7 arm swing animationTiger Wang2013-12-191-1/+23
| |
* | Disconnection message no longer shown if pingTiger Wang2013-12-181-5/+8
| |
* | The "<>" of a player name is now colouredTiger Wang2013-12-181-1/+1
| |
* | Fixed 1.7 player disconnection not calling hookTiger Wang2013-12-181-4/+14
|/ | | | This fixes #357
* Renamed back EntityAnimation to PlayerAnimationTiger Wang2013-12-181-1/+1
| | | | | This fixes #411 and partially reverts 30ead790490f04248b861db79fddde9148b552f4
* Fixed cClientHandle::Tick() being called from two threads.madmaxoft2013-12-161-6/+43
| | | | | When the player was initialized, the Tick() function continued to stream chunk, while the cWorld called Tick() from its tick thread. Final fix for #187.
* Fixed multiple player spawn broadcasts.madmaxoft2013-12-161-3/+0
|
* Merge pull request #437 from mc-server/ShootTo_functionSTRWarrior2013-12-151-2/+0
|\ | | | | Shoot to function
| * This adds a function that allows you to 'shoot' a player towards a direction.STRWarrior2013-12-151-2/+0
| |
* | Fixed calling OnPlayerJoined() in the wrong place.madmaxoft2013-12-151-6/+1
|/ | | | This is the first part of a fix for #187.
* Moved reading flags to the protocol.STRWarrior2013-12-151-17/+3
|
* Added m_IsFlying and m_CanFly. Both have a Get and Set function. Added cClientHandle::SendPlayerAbilities() functionSTRWarrior2013-12-151-0/+33
|
* Forgot to commit the ClientHandle.STRWarrior2013-12-141-0/+18
|
* Unknown packet type extended to 32 bits.madmaxoft2013-12-121-3/+3
|
* Merge branch 'master' of https://github.com/mc-server/MCServer into fixesnfeaturesTiger Wang2013-12-081-1/+1
|\ | | | | | | | | | | | | Conflicts: src/Bindings/Bindings.cpp src/Bindings/Bindings.h src/Blocks/BlockHandler.cpp
| * Moved bindings-related to a Bindings subfolder.madmaxoft2013-12-081-1/+1
| | | | | | | | Ref.: #407
* | Fixed trapdoors not togglingTiger Wang2013-12-071-1/+1
| | | | | | | | The redstone simulator kept on resetting them.
* | Renamed animation functionTiger Wang2013-12-071-7/+7
| | | | | | | | | | Renamed BroadcastPlayerAnimation to BroadcastEntityAnimation. Not just players can have animations, you know.
* | Fixed bed leave animationTiger Wang2013-12-061-1/+1
| |
* | Updated comments for slabsTiger Wang2013-12-061-5/+6
|/
* Switched to using provided ReadItem function.Samuel Barney2013-12-021-0/+9
| | | | Fixed misplacing when clicking on the bottom of bottom slabs and the top of top slabs.
* Properly fixed snow height, fixes #98 and #264Tiger Wang2013-11-301-9/+14
|
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+9
| | | | | 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/+2198