summaryrefslogtreecommitdiffstats
path: root/src/Protocol/Protocol17x.cpp (follow)
Commit message (Expand)AuthorAgeFilesLines
* Dropped 1.7 support (#3253)Mathias2016-07-211-3305/+0
* 1.9 / 1.9.2 / 1.9.3 / 1.9.4 protocol support (#3135)Pokechu222016-05-141-2/+16
* Bulk clearing of whitespaceLogicParrot2016-02-051-111/+111
* Changed the format of the MobHead data to allow MobHeads working on MInecraft 1.8bibo382016-01-111-1/+1
* Add enum for Sound and Particle EffectsDave Tucker2015-11-241-2/+2
* idle/deflating creeper should be -1Gargaj2015-11-091-1/+1
* Update Loops required for JsonCPPLukas Pioch2015-10-261-4/+4
* Namechange to CuberiteMattes D2015-09-251-3/+3
* Refactored cProtocol Chat handlingtycho2015-09-211-62/+5
* Fix old style casts and implicit conversionsMatti Hänninen2015-08-121-2/+2
* Silenced and fixed many warning messages across multiple files.Samuel Barney2015-07-291-28/+29
* Merge pull request #2348 from bibo38/customnameTiger Wang2015-07-151-9/+13
|\
| * Added CustomName and Health to sended Metadata of Monsters.bibo382015-07-151-9/+13
* | Merge pull request #2353 from SamJBarney/DyedArmorJulian Laubstein2015-07-151-2/+12
|\ \
| * | Leather Armor can now be dyed.Samuel Barney2015-07-151-2/+12
| |/
* / Improved mapsTiger Wang2015-07-141-44/+35
|/
* Fixed Middle-Click Button in the ClickWindow-Packet.bibo382015-06-251-1/+1
* Fix incorrent experience sending for 1.7 clientsjan642015-06-071-2/+2
* Changed SendAboveActionBarMessage / SendSystemMessage to be a noop for < 1.8 clientsjan642015-06-031-1/+11
* Added system and above action bar chat messagesjan642015-06-021-1/+55
* Merge branch 'master' into PreventNewWarningstycho2015-05-281-0/+63
|\
| * Merge pull request #1848 from scottwillmoore/ImplementTitleCommandMattes D2015-05-261-0/+63
| |\
| | * Implement backend for /title commandScott Moore2015-04-131-0/+63
* | | Fixed a lot of warningstycho2015-05-191-2/+2
|/ /
* | More style checking.Mattes D2015-05-091-2/+2
* | Added support for additional data in the ParticleEffect Packettycho2015-05-071-0/+10
* | Change visual protocol name to include MCServerjan642015-05-041-2/+2
|/
* Added VarInt64, normalized cPacketizer datatype names.Mattes D2015-03-221-328/+329
* Unified cPacketizer across all protocols.Mattes D2015-03-221-279/+266
* Fixed signedness warnings in Protocol.Mattes D2015-03-211-2/+2
* Fixed signedness issues in protocols.Mattes D2015-03-211-48/+52
* Unified cByteBuffer types.Mattes D2015-03-211-97/+123
* cPainting saving implementedTiger Wang2015-03-141-1/+1
* Protocol 1.7: Fixed Coverity issues.Mattes D2015-02-081-4/+7
* Fixed warnings in 1.7 protocol.Mattes D2015-01-181-106/+127
* Fixed Linux compilation.Mattes D2015-01-031-1/+1
* Protocols: Ignore garbage data at the end of PluginMessage packets.Mattes D2015-01-031-0/+11
* Refactored all player block placing to go through hooks.Mattes D2014-12-241-2/+2
* Fixed coverity issues in protocols.Mattes D2014-12-211-2/+5
* Many api fixes, add vanilla names to mob type -> string functions and mob spawner fixes.Howaner2014-11-291-1/+1
* Merge branch 'master' into MobSpawnerHowaner2014-11-181-12/+91
|\
| * Merge branch 'master' into ChunkLoaderHowaner2014-10-231-4/+4
| |\
| | * En masse NULL -> nullptr replaceTiger Wang2014-10-231-3/+3
| | * Properly exported cItemFrame and cHangingEntity to Lua.Mattes D2014-10-211-1/+1
| * | Merge branch 'master' into ChunkLoaderHowaner2014-10-211-1/+1
| |\|
| | * Improved furnacesTiger Wang2014-10-031-1/+1
| * | Optimized chunk loaderHowaner2014-10-021-0/+1
| |/
| * Fixed a missing semicolon.madmaxoft2014-09-301-1/+1
| * Rewritten plugin messages, vanilla are being parsed directly.madmaxoft2014-09-301-0/+92
| * Dropped support for <1.7.xTiger Wang2014-09-271-14/+0
* | Merge branch 'master' into MobSpawnerHowaner2014-09-261-214/+118
|\|
| * Merge branch 'master' into FixesHowaner2014-09-261-15/+15
| |\
| | * Merge branch 'master' into redstoneTestsTycho2014-09-251-4/+4
| | |\
| | * \ Merge branch 'master' into redstoneTestsTycho2014-09-251-196/+112
| | |\ \
| | * \ \ Merge branch 'master' into redstoneTestsTycho2014-09-171-3/+16
| | |\ \ \
| | * | | | Added first test to show the object can be createdTycho2014-09-171-15/+15
| * | | | | Fixed players custom name in 1.8Howaner2014-09-261-16/+4
| | |_|_|/ | |/| | |
| * | | | 1.7 Protocol: fixed potential problems with no-payload packets.madmaxoft2014-09-251-4/+4
| | |_|/ | |/| |
| * | | Merge branch 'master' into EntityCustomNameHowaner2014-09-231-195/+101
| |\ \ \
| | * \ \ Merge branch 'master' into 1.8-ProtocolHowaner2014-09-191-0/+13
| | |\ \ \
| | * | | | Exported player list states to extra functions.Howaner2014-09-181-7/+59
| | * | | | Moved chat json creating to the CompositeChat class.Howaner2014-09-131-170/+3
| | * | | | 1.8: Fixed maps.Howaner2014-09-131-3/+2
| | * | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-131-3/+3
| | |\ \ \ \
| | * | | | | Removed GetProtocolVersion() from the protocols.Howaner2014-09-111-3/+1
| | * | | | | 1.8: Fixed hangings.Howaner2014-09-111-1/+1
| | * | | | | 1.8: Added ParticleEffect packet.Howaner2014-09-111-2/+2
| | * | | | | Added the player list to the 1.8 protocol.Howaner2014-09-091-4/+9
| | * | | | | Merge branch 'master' into 1.8-ProtocolHowaner2014-09-091-0/+1
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | * | | | | More fixes.Howaner2014-09-081-1/+1
| | * | | | | Recoded cProtocol180 class.Howaner2014-09-081-56/+16
| | * | | | | Fixed more 1.8 packets.Howaner2014-09-081-19/+40
| | * | | | | Updated chunk sending to 1.8Howaner2014-09-081-6/+6
| | * | | | | Added GetProtocolVersion() to cProtocol.Howaner2014-09-081-14/+12
| | * | | | | Implemented packet compression.Howaner2014-09-081-1/+25
| | * | | | | Fixed client errors.Howaner2014-09-041-1/+1
| | * | | | | Added more 1.8 protocol things.Howaner2014-09-041-0/+1
| | * | | | | Started implementing of the 1.8 protocol.Howaner2014-09-041-2/+4
| * | | | | | Added SetCustomName() to players.Howaner2014-09-021-6/+20
| * | | | | | Added CustomName to cMonster.Howaner2014-09-011-0/+10
| |/ / / / /
* | | | / / Implemented mob spawner.Howaner2014-09-191-1/+13
| |_|_|/ / |/| | | |
* | | | | Added an explicit setting for allowing BungeeCord handshake.madmaxoft2014-09-171-1/+1
| |_|_|/ |/| | |
* | | | Full BungeeCord compatibility.madmaxoft2014-09-171-0/+4
* | | | Initial BungeeCord support.madmaxoft2014-09-171-0/+9
| |_|/ |/| |
* | | 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
|/
* Fixed 1.7.2 login packet reading.Mattes D2014-08-211-1/+5
* Merge pull request #1339 from mc-server/HooksSTRWarrior2014-08-201-28/+70
|\
| * 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
|\ \ | |/ |/|
| * Exported daylight cycle flag to the protocol.Howaner2014-08-111-1/+6
* | cProtocol172: Check return values.madmaxoft2014-08-111-4/+9
|/
* 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
|\
| * 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
|\|
| * 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
| * 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
|\|
| * 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
| * Merge pull request #1192 from mc-server/skinuuidMattes D2014-07-161-1/+12
| |\
| | * 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
| |\
| | * Crash and compile fixTiger Wang2014-07-041-1/+1
| * | Fixed respawningTiger Wang2014-06-291-3/+3
| * | Send statistics to the player, when he logged in.Howaner2014-06-291-2/+1
| * | Added generic entity-collecting.Mattes D2014-06-271-2/+2
| |/
* | Portals animate and delay correctlyTiger Wang2014-06-121-4/+4
* | Merge branch 'master' into portalsTiger Wang2014-06-101-1/+10
|\|
| * Fixed deadlock when moving players to other worlds.Mattes D2014-06-081-3/+12
* | 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-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
|\
| * Revert "Changed the old invulnerable methods from the wither to the new."Howaner2014-04-281-8/+1
| * 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
|\ \
| * | 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
|/
* Merge pull request #909 from jfhumann/fixesMattes D2014-04-221-37/+48
|\
| * Merge remote-tracking branch 'origin/master' into fixesjfhumann2014-04-181-24/+217
| |\
| * | 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
* | | 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
| * | 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-141-1/+1
| |\ \
| | * | Fixed mistakedaniel09162014-04-131-1/+1
| | |/
| * / Initial 1.7.6 protocol support.madmaxoft2014-04-141-0/+36
| |/
* | 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
| * 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
| |\
| | * Merge branch 'master' into ballisticmissilesTiger Wang2014-03-091-1/+15
| | |\
| | * | Implemented ballistic missiles (fireworks)Tiger Wang2014-02-271-25/+52
| * | | Merge pull request #777 from jfhumann/issue317Mattes D2014-03-091-1/+9
| |\ \ \
| | * | | 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
| | |\
| | | * 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
| | |\ \
| | | * | Implemented paintings, fixes #689Tiger Wang2014-02-181-0/+15
| | | |/
| | * | 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-161-0/+2
| | * Set max. Players in the Tablist to 60Howaner2014-02-161-1/+1
| | * Implemented cCompositeChat.madmaxoft2014-02-151-0/+153
| * | 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
| |\
| | * 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
| |\|
| | * Protocol 1.7 uses char for blockface.madmaxoft2014-02-041-2/+2
| | * Improved Type safety of eBlockFaceTycho2014-02-041-2/+2
| * | Fixed a bunch of MSVS warningsTiger Wang2014-02-051-1/+2
| |/
| * Limited sign lines to 15 chars.madmaxoft2014-01-291-4/+5
| * 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
| * Fixed client packet parsing.madmaxoft2014-01-261-12/+33
| * 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
| * | 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
| |/ |/|
* | Merge pull request #569 from worktycho/EnchantmentsFixMattes D2014-01-191-2/+3
|\ \
| * | Switched EnchantmentSerilizer to namespaceTycho2014-01-191-2/+2
| * | Spilt Writing of Enchantments to seperate classTycho2014-01-191-2/+3
| |/
* | Removed unneeded paramtersTiger Wang2014-01-191-5/+13
* | Changed SendBlockEntity format slightlyTiger Wang2014-01-191-4/+39
* | Improved command blocksTiger Wang2014-01-191-0/+25
|/
* 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
* | 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
* | | | 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
|/ /
* / 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-091-0/+12
* 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
| * Implement favicon for 1.7.2Bill Derouin2014-01-071-0/+13
* | 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
* 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
* Merge pull request #431 from mc-server/Entity_EffectsMattes D2013-12-141-0/+24
|\
| * 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
* 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
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-261-0/+15
* Merge remote-tracking branch 'origin/master' into foldermove2Alexander Harkness2013-11-241-0/+12
* Moved source to srcAlexander Harkness2013-11-241-0/+1917