summaryrefslogtreecommitdiffstats
path: root/src/Protocol (follow)
Commit message (Expand)AuthorAgeFilesLines
* Started implementing of the 1.8 protocol.Howaner2014-09-047-7/+502
* Make sure packets are validworktycho2014-09-011-6/+24
* Init RankMgr pointer to NULLworktycho2014-08-311-1/+2
* Merge pull request #1290 from mc-server/RanksMattes D2014-08-262-5/+40
|\
| * Merge remote-tracking branch 'origin/master' into RanksMattes D2014-08-223-43/+91
| |\
| * | cMojangAPI updates cRankManager's playernames.Mattes D2014-08-212-1/+40
| * | cMojangAPI: Fixed MakeUUID___() bindings.Mattes D2014-08-211-4/+0
* | | Type warning fixes.Mattes D2014-08-251-1/+1
* | | Fixed a type warning.Mattes D2014-08-251-2/+2
| |/ |/|
* | Fixed 1.7.2 login packet reading.Mattes D2014-08-211-1/+5
* | Merge pull request #1339 from mc-server/HooksSTRWarrior2014-08-203-42/+86
|\ \ | |/ |/|
| * Renamed a_Motd to a_ServerDescription.Howaner2014-08-202-7/+7
| * Added a_ClientHandle to the HOOK_SERVER_PING hook.Howaner2014-08-202-2/+5
| * Added "HOOK_SERVER_PING" call to older protocolsHowaner2014-08-201-13/+12
| * Cleaned up code.Howaner2014-08-201-1/+0
| * Added HOOK_SERVER_PINGHowaner2014-08-202-29/+72
* | Merge pull request #1296 from mc-server/LuaAPIFranz Reiter2014-08-129-10/+24
|\ \ | |/ |/|
| * Exported daylight cycle flag to the protocol.Howaner2014-08-119-10/+24
* | cProtocol172: Check return values.madmaxoft2014-08-111-4/+9
* | Gave names to unnamed enumsarchshift2014-08-111-1/+1
|/
* MojangAPI: Fixed PlayerNameToUUID().madmaxoft2014-08-041-1/+1
* Fixed #1286Howaner2014-08-041-1/+1
* Merge pull request #1285 from mc-server/StrCaseRefactorMattes D2014-08-042-32/+24
|\
| * Refactored case-conversion functions.madmaxoft2014-08-042-32/+24
* | Changed properties for-loop.Howaner2014-08-041-1/+1
* | Fixed skins in mc 1.7.9/1.7.10Howaner2014-08-031-6/+5
|/
* cMojangAPI: Added UUID-to-Name lookup.madmaxoft2014-08-033-60/+424
* Added cMojangAPI:GetUUIDFromPlayerName().madmaxoft2014-08-032-0/+35
* Merge pull request #1255 from mc-server/NameToUUIDMattes D2014-08-016-147/+619
|\
| * Merged branch 'master' into NameToUUID.madmaxoft2014-07-319-17/+17
| |\
| * | Removed trailing whitespace.madmaxoft2014-07-311-2/+2
| * | MojangAPI: Moved the settings to a separate ini section.madmaxoft2014-07-311-2/+2
| * | MojangAPI: Added a UseCachedOnly param to GetUUIDsFromPlayerNames().madmaxoft2014-07-312-4/+9
| * | MojangAPI: Renamed cache file to MojangAPI.sqlite.madmaxoft2014-07-301-2/+2
| * | MojangAPI: Clarified the UUID conversion code.madmaxoft2014-07-302-4/+17
| * | MojangAPI: Implemented UUID shortening and dashing.madmaxoft2014-07-303-20/+31
| * | Exported cMojangAPI to Lua.madmaxoft2014-07-301-1/+12
| * | Added a cMojangAPI class for PlayerName -> UUID lookups, with cache.madmaxoft2014-07-305-237/+556
| * | cAuthenticator: Added GetUUIDsFromPlayerNames().madmaxoft2014-07-282-3/+116
* | | Renamed functions and added beacon json saving.Howaner2014-07-311-2/+2
* | | Added beacon.Howaner2014-07-301-0/+15
| |/ |/|
* | Merge branch 'master' into portalsTiger Wang2014-07-292-2/+2
|\|
| * Removed redundant semicolons and re-added warningarchshift2014-07-242-2/+2
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-07-2210-82/+106
|\|
| * Style: Normalized to no spaces before closing parenthesis.madmaxoft2014-07-217-11/+11
| * Style: Normalized spaces after if, for and while.madmaxoft2014-07-211-1/+1
| * Fixed attempts to call c_str on ChatColorsarchshift2014-07-191-2/+2
| * Code style: Fixed braces on separate lines.madmaxoft2014-07-191-1/+2
| * Fixed spaces after commas in protocol data.madmaxoft2014-07-191-7/+7
| * Fixed style: spaces after commas.madmaxoft2014-07-192-2/+2
| * Merge pull request #1214 from mc-server/anti-globMattes D2014-07-191-5/+25
| |\
| | * Subdirs: Only add_library if not using MSVCarchshift2014-07-191-1/+3
| | * Protocol/CMakeLists.txt: Replaced glob with list of filesarchshift2014-07-191-5/+23
| * | Authenticator.cpp: Killed a global destructor warningarchshift2014-07-191-53/+56
| |/
* | Fix failed merge and other issuesTiger Wang2014-07-187-7/+7
* | Merge branch 'master' into portalsTiger Wang2014-07-1815-259/+351
|\|
| * ProtocolRecognizer.cpp: removed unused NumBytesReadarchshift2014-07-181-2/+0
| * Fixed tabs used for alignment.madmaxoft2014-07-172-12/+13
| * Basic style fixes.madmaxoft2014-07-176-9/+9
| * Normalized comments.madmaxoft2014-07-179-86/+86
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-163-98/+199
| |\
| | * SuggestionsTiger Wang2014-07-161-2/+5
| | * Function renameTiger Wang2014-07-162-3/+3
| | * Unified functionsTiger Wang2014-07-162-34/+28
| | * Store properties as Json::ValueTiger Wang2014-07-163-12/+20
| | * Player properties are now retrievedTiger Wang2014-07-143-102/+198
| * | Fixed MSVC warnings in SoundEffect functions.madmaxoft2014-07-132-14/+6
| * | Changed BroadcastSoundEffect function to take floating pos.Howaner2014-07-139-24/+25
| |/
| * Merge pull request #1154 from mc-server/trappedchestsTiger Wang2014-07-131-2/+2
| |\
| | * Implemented trapped chests & othersTiger Wang2014-07-071-2/+2
| * | Merge pull request #1135 from mc-server/fixesTiger Wang2014-07-091-1/+1
| |\ \ | | |/ | |/|
| | * Crash and compile fixTiger Wang2014-07-041-1/+1
| * | Fixed respawningTiger Wang2014-06-299-15/+15
| * | Send statistics to the player, when he logged in.Howaner2014-06-291-2/+1
| * | Added generic entity-collecting.Mattes D2014-06-279-15/+15
| |/
* | Merge branch 'master' into portalsTiger Wang2014-06-211-0/+1
|\|
| * Nullify deleted pointers.archshift2014-06-191-0/+1
* | Portals animate and delay correctlyTiger Wang2014-06-129-17/+17
* | Merge branch 'master' into portalsTiger Wang2014-06-105-3/+29
|\|
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-0810-16/+42
* | Merge remote-tracking branch 'origin/master' into portalsTiger Wang2014-06-041-1/+2
|\|
| * Fixed a crash in message formatter.madmaxoft2014-05-281-1/+2
* | Implemented end and nether portalsTiger Wang2014-05-319-13/+13
|/
* 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-117-7/+84
* Fixed MSVC 64-bit build warnings.Mattes D2014-05-092-11/+11
* 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
* Hotfixed Chunked transfer encoding in Yggdrasil.madmaxoft2014-05-031-1/+1
* Fixed connection encryption.madmaxoft2014-05-031-1/+1
* Fixed warnings in ClientHandle.madmaxoft2014-05-017-7/+7
* Removed the unused cBlockingTCPLink class.madmaxoft2014-04-301-1/+0
* Removed unneeded #includes.madmaxoft2014-04-291-6/+0
* Moved the rest of the Crypto objects into their own respective files.madmaxoft2014-04-294-23/+14
* Moved cRsaPrivateKey to PolarSSL++, rewritten using existing objects.madmaxoft2014-04-292-2/+2
* Merged branch 'master' into SslWrappers.madmaxoft2014-04-283-6/+11
|\
| * Merge pull request #940 from Howaner/GlobalFixesMattes D2014-04-282-2/+2
| |\
| | * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-282-16/+2
| | * Changed the old invulnerable methods from the wither to the new.Howaner2014-04-262-2/+16
| | * FixesHowaner2014-04-262-2/+2
| * | Merge pull request #954 from mc-server/projectiles-splitMattes D2014-04-282-1/+3
| |\ \
| | * | Fixed projectile source filenames, indentationsarchshift2014-04-282-3/+3
| | * | Moved cFireworkEntity out of ProjectileEntity.harchshift2014-04-271-0/+1
| | * | Moved cArrowEntity out of ProjectileEntity.harchshift2014-04-272-1/+2
| | |/
| * | Another attempt at #889.madmaxoft2014-04-271-3/+5
| * | Merge pull request #948 from jfhumann/staticFixesMattes D2014-04-271-0/+33
| |\ \ | | |/ | |/|
| | * Fixes resource leaks in the yggdrasil authenticator. (CID 43617)jfhumann2014-04-261-0/+33
| * | Cmake generated projects for IDEs include headers in project files.archshift2014-04-251-0/+1
| |/
* | Added the G1 root cert.madmaxoft2014-04-281-2/+29
* | Rewritten cAuthenticator to use the new PolarSSL++ wrapper classes.madmaxoft2014-04-271-91/+45
* | Authenticator uses some C++ SSL objects.madmaxoft2014-04-241-19/+40
|/
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-227-80/+104
|\
| * Small style changesjfhumann2014-04-182-7/+7
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-189-43/+719
| |\
| * | Did some static analysis, fixed some bugs and optimized a lot of codejfhumann2014-04-186-77/+100
* | | Allow 1.6.4 Forge clients to log in.Mattes D2014-04-212-0/+20
* | | Merge branch 'master' into Enchantingdaniel09162014-04-181-5/+131
|\ \ \ | | |/ | |/|
| * | Added asserts for proper game state.madmaxoft2014-04-161-5/+131
* | | Modified many thingsdaniel09162014-04-171-2/+0
* | | Merge branch 'master' into Enchantingdaniel09162014-04-169-38/+587
|\| |
| * | 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-148-119/+169
| * | A client UUID is generated when the server is in offline mode.madmaxoft2014-04-141-4/+10
| * | Merge remote-tracking branch 'daniel0916/YggdrasilAuthentication' into Proto176madmaxoft2014-04-143-1/+420
| |\ \
| | * | Fixed mistakedaniel09162014-04-132-2/+2
| | * | Fixed Error?daniel09162014-04-131-2/+2
| | * | Code Updatedaniel09162014-04-131-4/+5
| | * | Added Yggdrasil Authentication Systemdaniel09162014-04-132-0/+418
| | |/
| * / Initial 1.7.6 protocol support.madmaxoft2014-04-144-2/+69
| |/
* | Bug fixesdaniel09162014-04-141-3/+0
* | Fixed Errorsdaniel09162014-04-071-2/+2
* | Merge remote-tracking branch 'upstream/master' into Enchantingdaniel09162014-04-0715-366/+1139
|\|
| * Fixed 1.6.4 client crash on composite chat messages.madmaxoft2014-04-062-0/+14
| * Fixed crash in protocols sending 64-bit ints.madmaxoft2014-04-061-1/+1
| * Explicit change record size.madmaxoft2014-04-041-1/+1
| * Fixed format string mismatch.madmaxoft2014-04-041-1/+1
| * More Clang warning fixes in the protocols.madmaxoft2014-04-046-81/+82
| * Fixed CreateHexDump's signedness.madmaxoft2014-04-041-1/+1
| * More Clang warning fixes in the protocols.madmaxoft2014-04-041-28/+37
| * Fixed some Clang warnings in protocols.madmaxoft2014-04-0410-26/+31
| * Merge pull request #831 from mc-server/WitherMattes D2014-04-022-0/+18
| |\
| | * Protocol: Wither metadataandrew2014-03-252-0/+18
| * | Console logging supports cCompositeChat as its parameters.madmaxoft2014-03-311-22/+1
| |/
| * Plugins can set flying speed.madmaxoft2014-03-201-2/+1
| * Rewritten player speeds to be relative unit-less.madmaxoft2014-03-202-5/+6
| * Added additional macros to support the MSVC size_t format and changed all formats to use the macrosTycho2014-03-122-7/+7
| * Fixed a load of format string errorsTycho2014-03-112-4/+4
| * Fixed format errors in protocolTycho2014-03-111-3/+3
| * Removed unused macroTycho2014-03-101-13/+0
| * Merge pull request #731 from mc-server/ballisticmissilesTiger Wang2014-03-091-25/+52
| |\
| | * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-1/+15
| | |\
| | * | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-25/+52
| * | | Hotfix for MSVC compilation.madmaxoft2014-03-091-0/+1
| * | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-093-3/+29
| |\ \ \
| | * | | Adjusted style of switch/caseJan-Fabian Humann2014-03-093-45/+15
| | * | | Changed if-else to switch-caseJan-Fabian Humann2014-03-083-39/+33
| | * | | Split cClientHandle::HandleEntityAction() into three seperate functions HandleEntityCrouch, HandleEntityLeaveBed and HandleEntitySprinting.Jan-Fabian Humann2014-03-083-3/+65
| | | |/ | | |/|
| * | | Fixed issues with int vs size_t and a few other warningsTycho2014-03-081-2/+2
| * | | WarningsTycho2014-03-079-12/+25
| |/ /
| * / Add Flower PotsHowaner2014-03-071-1/+15
| |/
| * Manual merge (Fixed conflicts)andrew2014-02-209-17/+291
| |\
| | * Merge pull request #697 from Howaner/SkullMattes D2014-02-191-0/+15
| | |\
| | | * 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-186-0/+28
| | |\ \
| | | * | Implemented paintings, fixes #689Tiger Wang2014-02-186-0/+28
| | | |/
| | * | De-breaked stuffTiger Wang2014-02-181-2/+0
| | * | Implemented item frames, a part of #689Tiger Wang2014-02-181-2/+14
| | |/
| | * Add Locale to ClientHandleHowaner2014-02-163-2/+4
| | * Set max. Players in the Tablist to 60Howaner2014-02-161-1/+1
| | * Implemented cCompositeChat.madmaxoft2014-02-157-12/+231
| * | Map decorators; Map clientsandrew2014-02-187-1/+60
| * | Implementation of in-game mapsandrew2014-02-137-0/+91
| |/
| * Merge remote-tracking branch 'origin/master' into playerimprovementsTiger Wang2014-02-091-2/+2
| |\
| | * 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-093-7/+7
| |\|
| | * Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | * Improved Type safety of eBlockFaceTycho2014-02-043-5/+5
| * | Fixed a bunch of MSVS warningsTiger Wang2014-02-051-1/+2
| |/
| * Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
| * Added 1.7.4 to the list of supported protocols.madmaxoft2014-01-291-1/+1
| * Protocol 1.7: Encryption is enabled only with auth.madmaxoft2014-01-291-1/+1
| * Protocol 1.7: Forced encryption on all connections.madmaxoft2014-01-282-3/+101
| * Fixed client packet parsing.madmaxoft2014-01-261-12/+33
| * Merged branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-252-0/+87
| |\
| | * Comm logging is available in both Debug and Release modes.madmaxoft2014-01-252-12/+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-242-0/+69
| * | Merge branch 'master' into ChangeToPolarSSL.madmaxoft2014-01-231-3/+3
| |\|
| | * Fixed 1.5.x scoreboard packet IDsandrew2014-01-231-3/+3
| * | PolarSSL is fully used for 1.3.2 protocol encryption.madmaxoft2014-01-236-139/+51
| |/
| * Merge branch 'master' of https://github.com/mc-server/MCServerandrew2014-01-217-6/+90
| |\
| | * Fix a crash but somewhere...Alexander Harkness2014-01-201-2/+1
| * | Scoreboard SendTo()andrew2014-01-211-3/+3
| * | Scoreboard protocol supportandrew2014-01-218-5/+141
* | | added EnchantItemPacket to older Protocolsdaniel09162014-02-011-1/+4
* | | Some updates for enchanting (2)daniel09162014-01-314-14/+21
* | | removed hook from enchanting commitdaniel09162014-01-241-1/+1
* | | Some updates for enchantingdaniel09162014-01-242-4/+12
* | | first changes for enchanting (not finished)daniel09162014-01-202-0/+18
| |/ |/|
* | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-192-4/+6
|\ \
| * | Switched EnchantmentSerilizer to namespaceTycho2014-01-192-4/+4
| * | Spilt Writing of Enchantments to seperate classTycho2014-01-192-4/+6
| |/
* | Removed unneeded paramtersTiger Wang2014-01-196-11/+19
* | Changed SendBlockEntity format slightlyTiger Wang2014-01-196-13/+46
* | Improved command blocksTiger Wang2014-01-196-0/+42
|/
* Merge pull request #534 from mc-server/SpawnMinecartMattes D2014-01-171-2/+17
|\
| * Renamed cEmptyMinecart to cRideableMinecartSTRWarrior2014-01-121-6/+6
| * EmptyMinecarts should be able to get a block inside of them.STRWarrior2014-01-121-1/+16
* | Removed internal cEntity::GetRot() usage.madmaxoft2014-01-173-14/+14
* | Merge remote-tracking branch 'origin/customnames'madmaxoft2014-01-174-12/+62
|\ \
| * | Changed newline character because of issuesTiger Wang2014-01-161-3/+3
| * | Removed obsoleted functionsTiger Wang2014-01-163-7/+7
| * | Merge remote-tracking branch 'origin/master' into customnamesTiger Wang2014-01-162-30/+40
| |\ \
| * | | Implemented custom names and loreTiger Wang2014-01-151-5/+55
* | | | 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-162-30/+40
|/ /
* / Added handshake processing to protocol 1.7.madmaxoft2014-01-131-2/+23
|/
* Fixed wrong packet number for PluginMessage packet.madmaxoft2014-01-091-1/+1
* Added cClientHandle::SendPluginMessage().madmaxoft2014-01-097-0/+40
* Merge pull request #516 from mc-server/faviconAlexander Harkness2014-01-071-1/+1
|\
| * Fixed faviconsTiger Wang2014-01-071-1/+1
* | Plugin messages are received and handed to plugins.madmaxoft2014-01-071-1/+1
|/
* Merge pull request #514 from derouinw/masterMattes D2014-01-071-0/+3
|\
| * A few more touch upsBill Derouin2014-01-071-11/+1
| * Removed unused lineBill Derouin2014-01-071-1/+0
| * Implement favicon for 1.7.2Bill Derouin2014-01-072-0/+14
* | Fixed a few MSVC warnings.madmaxoft2014-01-072-3/+3
* | Fixed a few MSVC warnings.madmaxoft2014-01-064-5/+4
|/
* Added warning(push) and warning(pop) around all of the inclusions of cryptopp/*.hDiusrex2014-01-054-2/+52
* More memory alignment fixes.madmaxoft2014-01-021-3/+3
* Implented BroadcastParticleEffectSTRWarrior2013-12-229-2/+65
* Merge branch 'master' into cmakeTycho Bickerstaff2013-12-211-2/+2
|\
| * Fixed minor warnings.madmaxoft2013-12-201-2/+2
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-191-10/+3
|\|
| * Fixed PlayerAbilities and creativeTiger Wang2013-12-191-10/+3
* | moved protocol to globTycho Bickerstaff2013-12-191-1/+5
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-187-7/+115
|\|
| * Fixed player falling through the floor on spawn.madmaxoft2013-12-171-1/+5
| * Fixed player spawning packet.madmaxoft2013-12-151-1/+1
| * 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
| * Fixed pre 1.7 clients crashing.STRWarrior2013-12-151-2/+2
| * Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-147-0/+82
| |\
| | * Added SendEntityEffect and SendRemoveEntityEffect. Also a Player now gets the hunger effect when he has food poison.STRWarrior2013-12-147-0/+82
| * | Removed leftover debugging messages from cProtocol172.madmaxoft2013-12-141-4/+0
| |/
* | Merge branch 'master' into cmakeTycho Bickerstaff2013-12-112-195/+191
|\|
| * Fixed threading issues affecting cProtocol172.madmaxoft2013-12-132-191/+191
| * Fixed protocol 1.7 recovery after unknown packet.madmaxoft2013-12-121-4/+0
* | more cmakeTycho Bickerstaff2013-12-101-0/+7
|/
* 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-077-10/+10
* Removed stray printf, again.Samuel Barney2013-12-021-1/+0
* Switched to using provided ReadItem function.Samuel Barney2013-12-021-17/+3
* Removed stray printf.Samuel Barney2013-12-021-1/+0
* Fixed 1.7 slab and stair placement.Samuel Barney2013-12-021-0/+19
* Fixed the remaining derpsAlexander Harkness2013-11-274-5/+5
* Fixed some of tiger's derpyness.Alexander Harkness2013-11-271-2/+2
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-267-0/+48
* Further attempts to fix compileTiger Wang2013-11-255-7/+7
* Attempt to fix compilationTiger Wang2013-11-245-8/+8
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-247-1/+42
* Moved source to srcAlexander Harkness2013-11-2417-0/+7588