labofsahil/github-event-dataset-2012 huggingface dataset:
Зкончил меню начал делать добавление новостей
Merge branch 'master' of https://github.com/BNTeK/bntek.loc

Conflicts:
	www/application/classes/controller/main.php
	www/application/logs/2012/10/15.php
	www/application/views/main.php
	www/public/css/style.css
reflect changes in strconv package.

strconv.Floa64 -> strconv.FormatFloat
precomit 16.07
13.09 15.10
Created new printers

Made copties of printer and changed amounts. These will need revising
when exp of each level is known etc
boldifying
use 1.4.2
hangouts iframe attempt
revert iframe attempt
Merge remote-tracking branch 'upstream/master'
links for switching robot
put queue on index.php
created logout
fixed issue with queue box not showing queues for all robots
in main.php call queue_box.php for queue_box instead of status.php and call it every second instead of every five seconds
show robot name in queuebox even if no one is controlling it
on index.php merge connect to the robot links with the queuebox
Merge pull request #7 from timothyclemans/master

Buttons for switching robots
Ошибка при создании кэша
Replacing the last part from the old libsmack with an improved part...
List changes
New Files
Changes/New images
Changes
New Changes/Folders
Deletion
Moving Around files
Moving Files
Video HTML
Video changes
more changes
Image Opti. Add
Image Optimization additions
Txt file deleted
Lab 3
Fixed error on re-work object
Fixed filter rules in the template of the boolive layout
Fixed the choice of the first object of the search results
Added controller the Option  for ViewObject and for other
#17 Added widget ViewObjectsList to display list of objects
#20 Added widget for view Page
#32 Added widget for view Part. Update CHENGELOG
Use <Leader>; improve vimrc structure
vimrc - mostly comments
Fixed a YouTube bug
New version of the bar gae
mfreerdp-server: fixed some conditions that will crash the server
Control update + wider
Fixed remaining missing footer div tags
changed pc and processor to support reset

tb_toplevel stopped working :(
FlightControl project files for QT creator and first implementations added.
Typo fixed.
Target folders added.
FlightControl GUI done.
Bluetooth serial module implemented. Serial communication over bluetooth works.
Parser for received data via bluetooth implemented.
Config dialog for serial connection copied from QtSerialPort example.
Application doesn't exit correct.
Dirty dirty dirty SDL include.
Angle message parser added.
Temporary files removed, which can be automativally requild.
Renamed to serialsettings...
Battery voltage logging moved to pid module because of concurrency problems.
SDL and QT works with QT 4.8.1 (Win7 64bit). Joypad functionslity implemented and tested. Some bugfixes.
Typo fixed.
Dirty workaround to get goot battery values. A start of data byte block should be sent for each message.
AVRFlash21 installer for Win added.
Update My Scripts/Test.java
[Fix] Base32 and Base64.
Merge branch 'master' of github.com:CocoaPods/Specs

* 'master' of github.com:CocoaPods/Specs:
  [New Pod] NSRemoteLog, a minimalistic library for remote logging
  Add NSRemoteLog spec
[Fix] NSRemoteLog.
changed homepage to appropriate one
sharing on top, hide class
staring main.c
Switched async to true because jsonp does not allow syncronous
Added default sorting order to tag search results. Closed #959.
tweaked memory.java
seperate listener from styles
add some data to homepage
UI ล่าสุด
Revert "UI ล่าสุด"

This reverts commit 94d5a503e2aa676df674cc6034d69df892cebaab.
UI 11/08/2011 1:28
l
Prevent negative number of pilots to be submitted
Merge pull request #862 from atsareg/dev_sitedirector

SiteDirector fixes
Refix README.md
initial commit
first commit
khadija
Merge https://github.com/DPU2012/testApp
Подъем положения сумки в связи с движением чата.
Merge branch 'feature/getting-rid-of-old-event-system'

* feature/getting-rid-of-old-event-system: (29 commits)
  UT/RF: Refactor game_master tests.
  BF: Fix the game winning detection.
  BF: Add some (redundant) winning detection checks.
  BF: Avoid bool values for the winning team.
  BF: Increase round_index at the beginning of the round.
  UT/BF: Observe does not include round/turn anymore.
  UT/BF: Fix errors in datamodel tests.
  RF: Be consistent with bot_id.
  UT/RF: Remove event serialisation tests. (Events *are* json.)
  RF: send_to_viewers → update_viewers
  RF: Refactor GameMaster and states. (Needs review.)
  RF: Remove explicit round and turn from Tk update method.
  RF: For now use the original team.score instead of the state object.
  RF/UT: Remove TypeAwareList tests.
  RF: Remove round and turn from observe.
  RF: events → game_state to make the intention clearer.
  RF: Temporarily re-adding the current score to the teams object.
  RF: Re-adding the game finish overlay.
  RF: Remove obsolete TypeAwareList code.
  BF: Invert roles destroyer/harvester.
  ...

Conflicts:
	pelita/datamodel.py
	pelita/game_master.py
	pelita/viewer.py
	test/test_containers.py
	test/test_datmodel.py
	test/test_game_master.py
	test/test_layout.py
	test/test_player.py
NF: Demo code for a ZMQ Controller which allows remote code to interact with GameMaster.

The controller also allows for synchronisation of external code. One problem is that GM is not yet ready to run a bot at a time but only a complete round.
NF: Add PLAY/PAUSE button.
NF: Using iterator continuation magic to implement a play_step method.
NF: Wonderful Tk buttons: make step / play round.
NF: Adding a team_time counter.
RF: This speeds up OSX. But what about the rest?
Effects Test + Other stuff
enhance Qt5 compatibility

- replace Q_WS_MAC (not supported anymore in Qt5) with Q_OS_MAC (supported
  in Qt4/5)
fix #1843 by changing 2 GUI shortcuts
Merge pull request #1845 from Diapolo/fix_1843

fix #1843 by changing 2 GUI shortcuts
Remove unnecessary text from tooltip in AddressBookPage
Merge pull request #1844 from Diapolo/Qt5_compat1

enhance Qt5 compatibility
Концепция формы подписки на ленту активности. Форма приватных настроек пользователя.
Fixed the display of the backoffice dashboard
add Aperoweb Toulouse
update README

mention recess usage
add parse_flags function
add print_help function
Merge origin into local

Conflicts:
	renamer.lua
Full 4-gram 10% example, with sparse vector execution.
Récupération dynamique de balises meta et Open Graph

Signed-off-by: Ekomak <shaftstick@gmail.com>
Simplification du code associé aux balises meta et Open Graph
Merge branch 'master' of github.com:Ekomak/civblogs
rspec testcases for new WpItem class
libwinpr-sspi: remove dependency on unicode utils
libfreerdp-core: return proper event handles on Windows
libwinpr-synch: proper handling fd event creation on Windows.
Merge pull request #868 from llyzs/windows

Fix event handles on Windows
KT-2109 Nullability inference fails in extension function
 #KT-2109 Fixed
Merge pull request #82 from udalov/kt2109

KT-2109 Nullability inference fails in extension function
Stub for JetTypeParameterList element
Check all files have same package
Stub for JetProperty
Renamed JetIdeTemplateExpression.getText() to getPlaceholderText() to avoid confusing.
Removed UNRESOLVED_IDE_TEMPLATE diagnostic factory, since this check will be moved to CLI.
Renamed JetIdeTemplateExpression to JetIdeTemplate and made not a subtype of JetExpression. Fixed corresponding tests.
Added checking for unresolved templates in CLI. Added test.
Made accessor methods for private methods used in inner classes package-private.
KT-2279 Setter generated for abstract var is not abstract

 #KT-2279 fixed
Fixed CliTest.
Fixed CliTest.
Revert "Fixed CliTest."

This reverts commit 43ddf3768525fdd28a0a36712434aff05fbf2a1d.
Fixed CliTest.
Enabled ClassWithTypePExtendsIterableP in ReadJavaBinaryClassTest, disabled attaching jdk-headers in lazy resolve tests.
KT-2223 Comparing non-null value with null might produce helpful warning
 #KT-2223 Fixed
Merge pull request #83 from udalov/kt2223

KT-2223 Comparing non-null value with null might produce helpful warning
- Value parameters stubs
- ToString methods for stubs
- Some test fro stub tree construction
KT-2176 non-nullability is not inferred after !! or "as"
 #KT-2176 Fixed
Return an Application::set() value for ease of use

Signed-off-by: Steven Hoffman <git@fustrate.com>
Remove unnecessary code

Signed-off-by: Steven Hoffman <git@fustrate.com>
Merge loadController and runControllerMethod

Signed-off-by: Steven Hoffman <git@fustrate.com>
Move Twig from a static variable to the Application registry
Display and send error codes correctly
+ Add Response->setBody method
+ Use Response->sendOutput()

Signed-off-by: Steven Hoffman <git@fustrate.com>
Code cleanup
! trim() returns a string, so use ctype_digit() instead of is_int
! Don't duplicate numerical header information

Signed-off-by: Steven Hoffman <git@fustrate.com>
Updated error template

Signed-off-by: Steven Hoffman <git@fustrate.com>
Fixed Pathogen stuff, removed legacy comments, changed scrolloff
Merge branch 'master' of github.com:GRardB/dotfiles
Removed auto-ls from prompt and added jade to vim
Merge branch 'master' of github.com:GRardB/dotfiles

Conflicts:
	vim/visual.vim
added bowl throwing on swap and score calculations
Fixed issue with databas restore.
Merge pull request #221 from geoR/backup

Fixed issue with database restore in backup docs.
Moving version
Merge branch 'master' of https://github.com/Geta/opensource
add get_backup_column_type method to BackupMechanism
add length parameter to Code field
Merge branch 'master' of github.com:Governa/Camelot
Untouch
Update docs/cache.markdown
patch to fix affinity_filter on essex-ubuntu
include the patch recipe from nova scheduler
update README
Merge pull request #112 from rackerjoe/patch

Merged automatically by jenkins after successful build test
enable nova.scheduler.filter_scheduler.FilterScheduler
small patch
fix patching
get back to normal
Merge pull request #113 from rackerjoe/master

Merged automatically by jenkins after successful build test
enable the scheduler patch
Merge pull request #116 from rackerjoe/patch

Merged automatically by jenkins after successful build test
default patches to false
change default scheduler
Merge pull request #117 from rackerjoe/patch

Merged automatically by jenkins after successful build test
Merge pull request #118 from rackerjoe/filterScheduler

Merged automatically by jenkins after successful build test
Merge pull request #115 from JCallicoat/overcommit_filter_flags

Add CPU/RAM overcommit flags for nova.conf, closes #111
Adding logic around cpu/memory overallocation depending on which scheduler_driver is used
add notifications to templates that these files were modifided by chef
fixing format
Merge branch 'master' of https://github.com/rcbops-cookbooks/nova into templatecleanup
Replaced buttons and integers with encoders and FlightSimIntegers. This should work as an X-Plane radio/transponder interface now.
working with header element
Improve error logging with service
Added sleep setting to certnanny script
add CertNanny's new Singleton

Conflicts:
	agent/bin/certnanny
	agent/bin/certnanny.pl
Add code to remove singleton for service
Added an installation section to the README.
Added JPEG
More interesting test file
Add missing initializer to the logging
Update FAQ and README with links to the ArXiv version of the paper. Fix #160.
syscall uname.
SeverityValue is now dynamically generated in DTO.
ViolationDTO is now 100% dynamic
Now XVimWindow is associated with IDEEditorArea ( it was with DVTSourceTextView before )
doc: "next largest" => "next larger".

Thanks to Wang <kookbond@gmail.com> for reporting. Discussion:

https://groups.google.com/d/topic/julia-dev/Vnwnwt3NwBo/discussion
Make product iterator iterate in a more natural fashion.
Merge pull request #1488 from kmsquire/iterator_update

Make product iterator iterate in a more natural fashion.
Vectorized and devectorized versions of the laplace benchmark now
give the same results (#1168)
Merge branch 'master' of github.com:JuliaLang/julia
Update OpenBLAS to 0.2.5 and FFTW to 3.3.3
Cherry pick of Makefiles and libuv
64-bit mode for suitesparse.
Update zsh-completions.
Add npm
Fix yankring Y
Added library to process IRC commands, and moved Config location.
Fix handling 'port' option in cnf file.
Support /etc/my.cnf
bug

del
webUI 2012.10.25
???
Merge branch 'texture' of ssh://github.com/KPWhiver/DimLib into texture
Fixed some bugs
Merge branch 'texture' of ssh://github.com/KPWhiver/DimLib into texture

Conflicts:
	include/DIM/texture.hpp
Added the get_backlinks(false) to processData servlet so that when call
to SEOMoz returns an exception - we can still retrieve the backlinks
another day.
selinux - katello configure denials
selinux - retab
Merge pull request #390 from lzap/selinux_installer_fix

Selinux installer fix
Rescue foreman model exceptions
Initial commit to setup the models and migrations for object-labels
Added code to get the initial org + env create working in the UI
Added indexes to the migration script to enforce uniqueness constraints
Made the label columns non null
Improved the message in the katello label validator
Merge pull request #635 from parthaa/init-label-work

Initial commit to setup the models and migrations for object-labels
Fixed all organizatio.create related unit tests
Fixed all KTEnvironment.create unit tests to take the label
Merge pull request #638 from parthaa/init-label-work

Unit test merges
Added code to create product and repos with labels

Unit tests are to be worked out yet
Merge pull request #649 from parthaa/initial-prod-repo-creation

Added code to create product and repos with labels
object-label - organization - rename column cp_key to label

This commit renames cp_key as label.  Since the cp_key currently behaves
as a label we do not need to add a new column; however, for consistency
with other objects (e.g. env/product/repo), we are renaming it.  This
should also be useful as other systems that are 'org' aware that we
may interface with in the future would use the same label.
Merge pull request #654 from bbuckingham/fork-object-labels

object-label - organization - rename column cp_key to label
Misc unit test fixes
Partial commit on product create
Fixed all the product related tests
Merge pull request #655 from parthaa/product-env-unit-tests

Product env unit tests
object labels - update to use environment label for candlepin environments

Minor change to creation of candlepin environment objects to
use the katello environment.label (vs name).
object labels - add read-only label to edit panes for org, env, prod, repo

Small commit to add the object label as a read-only element on
the edit panes for organizations, environment, products and
repositories.
object labels - update activation key edit helptip to reflect use of label

Minor change to the edit pane for activation keys to indicate that the
organization label is used when registering using the key.
Fixed issue with Ldap mixing in
Added sync_ldap_roles to CLI
add development dependencies to our yum repo
Merge pull request #955 from xsuchy/pull-req-dep

add development dependencies to our yum repo
CS - Styling updates.
CS - Fixes checkbox showing through env selector, remove auto complete
icon and button sliding under input box.
CS - Updates for taller rows to accomodate larger repository names.
Adds tooltipping to ellipsied names.
CS - Updates to the way package names are displayed.
CS - Updates path selector footer to allow for arbitrary content.
CS - Moves the comparison grid JS into the widgets section.
CS - Adds Manage Organizations link to the environment selector.
CS - Addition of ellipsis names of column headers with regards to
showing both the repository name and environment name on repo compare.
CS - Adds permission check for managing environments on environment
selector.  Adds direct link to current organization if link is present.
CS - Turn more colors into variables. Fixes issue with label appearing
uncentered.  Adds disabling and tooltip to compare repos button.
CS - Adds removal of metadata row whenever all elements have been
loaded.
CS - A number of minor updates.

Changes 'repos' to 'Repositories' in a few places.
Box shadow around environment selector.
Icon state changing when included as part of a link.
Faded text look when there are more columns to the right.
Merge branch 'master' of github.com:Katello/katello into content-browser

Conflicts:
	src/public/javascripts/katello.js
CS - Adds missing variablization of color.
Merge pull request #401 from ehelms/content-browser

Content Search Styling and Interaction Updates
Fake Errata generator fixes

- added support for errata type
- fixed parsing rpm info output to get correct version and release
- added pulp admin password extraction from pulp.conf
Merge pull request #620 from mbacovsky/types_in_errata_generator

Fake Errata generator fixes
Rails32 - Moves all setting of tupane_layouts to the views
instead of the controller to reduce declarations, allow the view
to control it's own layout and to make it work with 3.2
Rails32 - Converts deprecated attributes_from_column_definition
to new self.class.column_defaults.
Rails32 - Switch from deprecated ActionController::UnknownController to
::AbstractController::ActionNotFound
Rails32 - Removes validation that is enforced by database
and would otherwise require the join table to have a
primary key.
Rails32 - Updates deprecated 'set_table_name' to use
'self.table_name = ""'
removed old stuff [Doctrine] [Audit]
Update Arduino.mk from upstream.

Source:
  https://github.com/Kegbot/Arduino-Makefile/tree/409823d061adf4aa0368317d3d36312880c06d0e
Arduino-Makefile: update tools to use `/usr/bin/env perl`
Update gitignore.
Changed ddl-script.
Merge branch 'master' of github.com:KeyTech/KeyTech
added content-type detection on image uploader and media content-type picker
The view html script now matches files with case insensitivity
Addition of a way to have deadlines first and sorted in the daily and the weekly
translated diplomas
Merge pull request #78 from pilladoll/patch-26

translated diplomas
Update master
Merge pull request #193 from mafiox/patch-78

Fix typo 2/0160
Update master
Merge pull request #117 from mafiox/patch-6

Translated lots of lines 2/0011
Removed UML and added TinyUML
Return request in `putStream`.
Add progress emission to `putStream`.
Redo `putFile` progress emission in terms of `putStream`'s.
Add a blurb about progress events to the README.
Merge pull request #85 from LearnBoost/progress-for-everyone

Progress for everyone
Fix quantile lambda range
adding Core data entities
SetPlayerName, SetPlayerCountry, SetPlayerClan, GetPlayerColorBody, GetPlayerColorFeet
Merge remote-tracking branch 'MAP94/master' into nclient
Merge pull request #41 from east/nclient

SetPlayerName, SetPlayerCountry, SetPlayerClan, GetPlayerColorBody, GetPlayerColorFeet
v1.1
Merge branch 'master' of github.com:MCSTIE/WordLGen
Merge branch 'develop' of git@github.com:MG-RAST/MG-RAST
Merge branch 'master' of git@github.com:MG-RAST/MG-RAST
fixed bad array assignment
Merge pull request #200 from teharrison/master

hotfix for analysis page bug
Nro_Documento correccion en el formulario
Fixed nametable
[fix] 86,parser,error,message: remove 'found a binding as condition' message
Player Spawn Point Calculation added
Added Structure Handling to Recepie-Mixer
Auto generate world view frame
Radio
Merge branch 'madsim'
Removed unnecessary comment in KingOfTheHill.cpp

Signed-off-by: Tillman <reetopps6@hotmail.com>
Two playable versions of Maze. Collision okey. Response needs improvement. PlayCredits and PlayCredits2
extra pillar is removed now.

Signed-off-by: eXpliCo <johansson_@hotmail.com>
Fixed critical bug for gismeteo.ru
Added Chines trnlation file
Moved contextkit to applet and added description field to contextkit
Factoids: fix l10n-fi.
scripts/supybot-plugin-create: Fix issue #181.
Web: Fix unicode problems for titleSnarfer.
PluginDownloader: update l10n-it.
Merge pull request #349 from Mkaysi/supybot-plugin-create

Fix issue #153.
Merge pull request #350 from Hoaas/testing

Fix issue #347.
The invoker methods from ConstrainableBuilder are removed with neceserry
changes in ObjectBuilder and ObjectBuilderTest.
Implimentation of constraints of builder is separated to BuilderConstraintsImpl 
Implementation of Builder separated to BuilderImpl
Constrainable and Buildable are not independent

ConstrainableBuildable is created to extend both the interfaces for
eliminating the need of implementing both in ObjectBuilder and
ListBuilder or other custom builders.

A trick is added for more powerful chaining. Return type of execute, set
and construct methods in ObjectBuilder is now set to ObjectBuilder. The
same is true for ListBuilder.
Therefore, new ObjectBuilder<MyClass>(...).execute(...) will now return
ObjectBuilder<MyClass> instead of Constrainable<MyClass>.
now
Constrainable implementation removed from ObjectBuilder and ListBuilder.

Now they can have parameter of type Constrainable via constructor.
Constrainable is changed to Configurable
1. configuration and builder packages are separated from the single
builder package.

2. implementation package is removed. All builder related classes are in builder package and all configuration related classes are in configuration package.

3. BuilderImpl is renamed to Builder and ConfigurationImpl is renamed to Configuration.
perhaps the last commit mistakenly excluded the test project prom commit. Doing it now.
bugid-64236: Implement JavaScript to handle interactions
Merge branch 'bugid-64236' into consumer-sprint-18-bugid-52249-toolboxframework
Merge branch 'consumer-sprint-18-bugid-52249-toolboxframework' of github.com:Wikia/app into bugid-64236
bugid-64236: Implement JavaScript to handle interactions
Merge branch 'bugid-64236' into consumer-sprint-18-bugid-52249-toolboxframework
bugid-64236: Implement JavaScript to handle interactions
Merge branch 'bugid-64236' into consumer-sprint-18-bugid-52249-toolboxframework
bugid-64236: Implement JavaScript to handle interactions
Merge branch 'bugid-64236' into consumer-sprint-18-bugid-52249-toolboxframework
loading init javascript
Added skinScripts to load different ViewPageTargets for the skins
Copied mediawiki.Uri.js from MW1.20, further integration work
Temporary change: Override read access for anons for API calls.
Configure VisualEditor to point to Parsoid installed on dev-inez.
DevBoxes does not use proxy anymore
show debug info
Add WMU support for adding/editing SDS image objects
bugid-64236 | added model for datepicker on marketingtoolbox
backend code for removing sds objects
Small comment typo
Remove generated types.
Initial import of the Makefile structure.
Removed the header and cleaned up a little in the layer code. Beginnings of refactoring/optimization.
Removed a bit of commented layer code
Fix for updating a package twice without applying the update. Now overwrites with anything new from a newer package.
ViewArchitect: Add configuration form
Add info about refresh rate
Update title on check
Show info about refresh rate even on error
Capitalize word
HTML-escape MOTD instead of hyper-restrictive regex
Bump version
Change file names to easier ones (NH)
work around a Scala 2.10 bug by rewriting a piece of code a bit

new code is actually better I think
upgrade to Scala 2.10.0-M6
remove workaround for Scala 2.10 regression fixed in 2.10.0-M6
Replace typeclass pattern by simpler type hierarchy
Remove obj parameter from root Mirrorable class
Add interface globals to mirroring
Merge branch 'modelruns' of github.com:NetLogo/NetLogo into modelruns
StructureParser: update comments
simplify StructureParser
fix #200 on 5.0.x, including Seth's optimization
issues.scala: cherry-pick latest version from master

mainly to get the change where labels (e.g. bug, enhancement) are
included in the output
add loadedExtensions method to ExtensionManager (fixes #209)
fix bin/benches.scala for 5.0.x (classpath fix needed)
add links to java download, test and troubleshooting
add heading-to-angle reporter to atan documentation
upgrade to sbt 0.12.1
upgrade Dispatch to latest version (0.9.2)
avoid spurious i18n error message warnings (fixes #218)
fix performance of ask + tasks + recursion

fixes #215
Merge remote-tracking branch 'origin/5.0.x'

Conflicts:
	bin/issues.scala
	headless/src/main/org/nlogo/api/DummyExtensionManager.scala
	models
	src/main/org/nlogo/api/ModelReader.scala
@实现了内存管理算法
通过测试，能比c库快上2~3倍左右
drop operator '~' from stage 0
Bug: turn on SD_FAST_XFER_AKTIV and compilation fails if PID is
disabled.

Fix:
If SD_FAST_XFER_AKTIV is defined, fast_xfer() only declares
g_heater_pwm_val if PIDTEMP is defined, but later assigns
g_heater_pwm_val=0 regardless whether PIDTEMP is defined or not. If
PIDTEMP is undefined, g_heater_pwm_val is undeclared at compile time and
generates the appropriate error. I solved by not using g_heater_pwm_val
if PIDTEMP is undefined (and therefor undeclared.)

Also, the extern declaration was as an int, when g_heater_pwm_val is
defined as a volatile unsigned char. This caused a duplicate declaration
error, which was solved by changing the declaration in fast_xfer() to
match the definition. I didn't dig deeper to try to understand if the
mismatch was intentional or test operation other than verify the compile
errors no longer occur.
Merge branch 'master' of github.com:OhmEye/Sprinter
Remove gcc version check on math optimizations
 - We need to fix this in the code
 - If the code cannot be fixed, remove single optimizations wich cause issues
Merge pull request #21 from subcomandante/optimizations

Remove gcc version check on math optimizations
Initialize the progressbar pointer (intpb) in the base integrator class.

This fixes a crash reported in this bug:
http://www.yafaray.org/node/497
Merge pull request #23 from boiko/progressbar_init

Initialize the progressbar pointer (intpb) in the base integrator class.
Initial headers and dummy implementation for Heap node and Minimum heap.
Merge branch 'master' of github.com:OltzU/tiralabra
sqlite3 temporarily reimplemented
rename theme to fatcow
Use BigInteger's built-in constants for zero and one
implement dns checking
PHPUnit and Selenium tests
Unit tests
Merge branch 'master' of https://github.com/PierreJ/puzzler
localhost v1
Initial commit
Merge github.com:cytms/lightrip_local into localhost
test
Merge branch 'localhost' of github.com:Pinyen/lightrip
undone
Added License to the project in write protected form <word file>
added the license infromation
Es werden nun die Map/Skript - Namen auf enthalten von "uw", "iw" oder "ow" geprüft
Die "uw", "iw" der "ow" müssen am Angang des Dateinamens stehen.
Das sollte Issue 161 beheben
Rétablissement des styles visuels
Suppression du FormConfiguration

FormConfiguration hérite de Form, en l'occurence, il peut être supprimé
(il n'apporte rien de plus à l'heure actuelle)
fix missing ui icons
improved translations
cleaning css
Revert to previous CSS Bootstrap version.
- ``luhnok`` validator added (credit card luhn mod10 validator).
Fix typo about FLOSS Weekly Podcast
Merge pull request #32 from msabramo/patch-1

Fix typo about FLOSS Weekly Podcast
link for user
return libcore to cyanogen
use yaffs2 from tpruvot repo
Ajout Commentaires DEV
Merge branch 'GUI' of github.com:RL77LUC/C.O.R.E into GUI
added indexes, updated sql file
A lot of chat view/etc tweaking
Score label and spin moved to info line.
Libtcod-removal starting. Added sprite sheets from Lofi pack, added own graphics+input lib based on pygame. The engine is now dependent on pygame.
Added GEMFILE and inited rspec
added a dummy line to test synchronization
initial commit
reading rocks
Header docs for entity identifier
Change readme credits.
ArreiList ja KolmiKeko
adicionei umas coisas ai pra compilar o relatorio
Update index.html

Removed duplicated html tag.
Modify: 取消鼠标的自动让开, 避免在编辑的时候造成指针的难以控制
Updated cron commands.
Adding documentation and cleaning up unused settings.
Update with candidate release version numbers
[s1696] Implement spell 37431 and related auras
Implement player gear score calculation

Signed-off-by: Salja <salja2012@hotmail.de>
Merge branch 'GearScore' into AllInOne
@11
unbumbed version string
code formating
- [fix] #57 Bottom of drop down menues is hidden in the inline view of the index
bumped version string
Merge branch 'release/2012-08.02'
Fix nickname truncation issue with MessageEventArgs
Typo with IsAction/IsCtcp causing the check to fail
Remove bad/unused references
Prevent wrap-compile from being called twice by if-let.
Commit lang.php changes resulting from compilations.
Merge branch 'master' of https://github.com/Scriptor/pharen
Add inc and dec functions.
Convert backslashes in ns name to forward slashes to make them proper paths.
Directly compile the text contents in load. Don't use compile-file.
Put the REPL in a namespace so you don't need to manually enter a test namespace to start use-ing things.
Recursively pretty print embedded sequences when trying to print a seq.
Allow namespace qualified partial functions to work and make sure anything with a dot in it is compiled as a LeafNode.
Initial commit for basic four in a row game.
fix static file bugs
Добавил подсчет войск попавших в капкан
Merge remote-tracking branch 'origin/Shikaka' into Shikaka
Merge remote-tracking branch 'origin/Shikaka' into Shikaka
Немного убрал Warnings
Исправление автостройки.
не строились несколько уровней подряд.
не вычеркивались начавшиеся строиться
- Added window restore.
Merge branch 'master' of github.com:Shougo/vimfiler
Fixed failing tests on non-English OS (#338)
Merge pull request #512 from akoeplinger/fix-#338

Fixed failing tests on non-English OS (#338)
Load test harness support for batching (work in progress)
Load test harness updates
- Use KnockoutJS for dashboard
- Dashboard now supports messages/sec or message batches every nth sec
- Dashboard should now keep in sync correctly with running state
- Fixed a double decrement counter issue with subscription
Updates for 1.4
Entity additions, villager types, skeleton types.
Item Additions.
Magic Numbers Reduction

Signed-off-by: Sleaker <sleaker@gmail.com>
C-U競合につき削除
latex
latex
WP Vecer
Merge branch 'nedela' of git://github.com/xardael/cvWebGen

Conflicts:
	src/cz/muni/fi/pb138/cvWebGen/DefaultController.java
Size-adjustment now available.
Added .gitconfig and .gitignore_global files.
Tweak hit-aera of organization contact methods
Apply background-color on body tag or else not seen due to bootstrap
Tweak charting graphics
Update pie chart CO2 Sources, closes #63 and closes #19
Parse textual content in a manner that allows directives to be used there too; this allows us to easily use co2r-terms now
Delete old example app
added matrix division by scalars

Intended for use to normalize.
added normalization, testing, and updated length

Normalization is functional and rather fast now.  Length works fine,
added functionality that respects OpenGL-style matrices and vectors, not
touching the final component.
Script mostly working
Removed static xmlApplicationContext field from SpringDeployment
code example
Merge remote-tracking branch 'origin/master'
enable textile
Cleaning up some Kroll named variables
Add list about working and non-working CodeSourcery versions
Added JellyBean final board with pins name.
parse the tdtool --list output
tree map started
IN PROGRESS - issue GWDP-228: Investigate cache of QW data. What is
table structure? How read, how write? 
http://internal.cida.usgs.gov/jira/browse/GWDP-228

Created table that holds water quality data as Oracle XMLType column.
Start of cache code that uses that table.
IN PROGRESS - issue GWDP-228: Investigate cache of QW data. What is
table structure? How read, how write? 
http://internal.cida.usgs.gov/jira/browse/GWDP-228

Removed unused methods and imports.
Merge branch 'master' of https://github.com/USGS-CIDA/ngwmn.git
Fixed headers in ncss csv responses. Now csv is opened in the browsers.
My first commit
Hello World Commit
Revised print statement.  Added name. 
initial commit - cs454 - hello world app
Merge pull request #16 from nhthanh87/master

request approved.
Merge pull request #14 from cpcs454/master

Request approved.
Merge pull request #15 from nelsonmaltez/master

Request approved.
hello world app
Hello World
Merge pull request #18 from Constants/master

Merge approved.
Merge pull request #17 from Vanquish59/master

No problem.  Merge request approved.
Merge pull request #19 from zyrmpg/master

Approved.
Merge pull request #1 from pcwerk/master

Pull Request
update directory structure

Per Greg and Constance recommendation we rearrange the directory
structure into a search engine directory organization
Remove santon file
remove student's commits
Merge pull request #2 from pcwerk/master

get from master
version 0.0.1 release

This is extensive reorganization of the SECK, we now break down the
components into three parts
deck-app, deck-lib, and deck-web.  Please refer to the README for more
information.
prune mac turds

remove .DS_Store
More informative README

Update README for more pertinent information
add_task_2
Adding Styes & images.
added accumulate, transform
Added view_forum and add_post permission(not complete)
UMFtohtml project added,AcmMonitor container done
First Tokens + AsmMonitor tests
PlainText, Variable tokens and VariablesHolder
Additional variables in VariablesHolder
Two more additional variables
TemplateToken adding + AnythingExceptToken fix.
introduced fugitive plugin for integration with git
semantic: Correctly type unary minus and plus operations.
Database transaction optimization.
Update README.md

Added impress.js
Fixed broken imports in Simulation
Updated .gitignore with vim temporary files .swp
Fixed broken and unused imports in InitialConditions
Test Pixi interpreter & parser
Merge remote-tracking branch 'origin/master' into TestPixiParser
Merge pull request #13 from karolovbrat/master

Fixed broken imports in Simulation and updated .gitignore

.gitignore for vim temporary files .swp
Added JTransforms dependency to the pom file
Renamed Particle2D -> Particle
Moved Particle2D data inside Particle
Introduced accessors in Particle class
Moved the assignment of previous position to a single place - into the Simulation.pushParticles (before the particles are moved their position is stored)
Removed unused methods from Particle class
Removed trailing spaces in Particle.java
Merge pull request #14 from karolovbrat/particleRefactor

Particle2D refactoring:
- introduce accessors
- rename Particle2D to Particle
- update place where previous position of particles is stored
- add JTransforms dependency to pom file

After pulling this to master you might want to add JTransforms into your local maven repository. How to do so is described here:
http://maven.apache.org/guides/mini/guide-3rd-party-jars-local.html
Merge openpixi-master brach changes
decoupled window resize from simulation resize
display method now considers the radius of each particle
changed scaling to be compatible with true particle radius
Merge master into test
Merge master into simulation_resize
Updated README with working links
made spec a bit more resiliant to disconnections
fixed dumb race condition causing inf loop
Use upstart to manage heimdal daemons
removed from upstart legacy code from init.d
Merge branch 'jag/users-heimdal-upstart'

Conflicts:
	main/users/ChangeLog
weyland final version
weyland assets
cleanup
[*] force link for socket connection
ページヘッダ（主にメニュー）
ページのヘッダ、フッタのテンプレートを分離
ツアー一覧テンプレート（トップ、検索ページで共有）
ツアー、スポットのトップと検索ページテンプレート（一覧のテンプレートは共有）
トップページ
ログインページテンプレート
スポット登録ページテンプレート
ユーザページテンプレート
ツアー登録ページテンプレート
favicon
各機能毎にJavascriptを分離
DB操作系はなるべくモデル内で実装
検索ページ追加
ヘッダ、フッタテンプレートを分離。出力用の共通メソッドを通す
コピー処理追加
サービス名変更
カテゴリ名のみ取得するメソッド追加
スポット検索をモデルに分離
タグ一覧を連想配列で取得
検索をモデルに分離
Update stylesheets/stylesheet.css

cran img
MDL-36341 calendar: fixed JS bug with popup node setter
MDL-36840 Set course.format to 'site' for site-course
MDL-36943 Do not notify about already installed updates

Before this patch, the available_update_checker::cron_notifications()
method accessed the availableupdates property. But for plugins, that property
basically contains the most recent version available. So we were missing
the check against the actual version installed.

The fix was simple - obtain available updates via the available_updates()
method that performs the check.
MDL-37003 Fix repeated line in update notification email

There was a problem experienced after 2.4.0 release because the version
of the 2.4.0 release was the same as 2.5dev release. So the version
value matched twice in the loop and the line was repeated in the email.
Merge branch 'wip-MDL-36341-m24' of git://github.com/samhemelryk/moodle
MDL-36963 Improve mdeploy worker::move_directory() method

The additional parameter allows to use this method without actual
removing the root of the source location. That is, it is now possible to
move the content of a folder only.

Also, a small refactoring happened here as we will need a variant of
this method that does not throw exception if the target already exists.
MDL-36963 Improve mdeploy worker::remove_directory() method

The additional parameter allows to use this method without actual
removing the root of the path. That is, it is now possible to remove
the content of a folder only.
MDL-36963 Add unit tests for directory operations in mdeploy.php
MDL-36963 Do not attempt to remove the root folder of a plugin during the update deployment

There is no need to move the root folder of a plugin during the update
deployment. We just need to operate with its contents. So the web server
process can have the write access for the plugin folder only.
MDL-36960 - fix broken horizontal positioning of titles for docked blocks
weekly on-sync release 2.5dev
MDL-37011 - themes: Fixed the alignment of the edit and help icon on the participants page.
MDL-31750 - course - Improved capability checks for course/edit.php and course/category.php
Add autocomplete optimize
Start MD file in Chinese, And Check the AS's translation.
Doing MD Convert, Reach 3.Definitions
Doing MD Convert, test for <h1>
Test for link in same page.
Test Text Color
utf-8 sify
Merge branch 'master' of https://github.com/activesys/asn1x
Check Translation to 3.6.12
Merge branch 'master' of https://github.com/activesys/asn1x
Add Submodule For Docs. Make Project Clearly.
Merge pull request #2 from reyoung/master

添加了Sphinx格式的翻译文档
Simple interests list added.
(stress) support for CQL prepared statements
patch by David Alves; reviewed by Pavel Yaskevich for CASSANDRA-3633
r/m redundant @Override
restore pre-CASSANDRA-3862 approach to removing expired tombstones during compaction
patch by jbellis; reviewed by slebresne for CASSANDRA-4364
allow dropping columns shadowed by not-yet-expired supercolumn or row tombstones in PrecompactedRow
patch by jbellis; reviewed by slebresne for CASSANDRA-4396
merge from 1.0
add missing import
use data size ratio in liveRatio instead of live size : serialized throughput
patch by jbellis; reviewed by slebresne for CASSANDRA-4399
avoid using global partitioner to estimate ranges in index sstables
patch by jbellis; reviewed by yukim for CASSANDRA-4403
implement addAllWithSizeDelta for ThreadSafeSortedColumns (used in Memtable for supercolumns); see #4399
log mx4j absence at debug
Correctly catch exception when Snappy cannot be loaded

patch by slebresne; reviewed by Andy Cobley for CASSANDRA-4400
update default commitlog segment and total size
patch by jbellis; reviewed by vijay for CASSANDRA-4422
(cql3) Support ORDER BY when IN condition is given in WHERE clause
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4327
Fix for Test failure: remove hardcoded values in CLT
(cql3) delete "component_index" column on DROP TABLE call
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4420
fix mixing user-provided timestamps and local deletion time for #4396
merge from 1.0
change nanoTime() to currentTimeInMillis() in schema related code
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4432
change System.currentTimeMillis() to FBUtilities.timestampMicros(), related to CASSANDRA-4432
If detected cores is zero, try at least one.
Patch by Andy Cobley, reviewed by brandonwilliams for CASSANDRA-4401
stress tool to return appropriate exit code on failure
patch by Tyler Patterson; reviewed by Pavel Yaskevich for CASSANDRA-4188
merge from 1.0
merge from 1.1
Add support for ReversedType in CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4004
Add timeuuid type to CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4194
Minor fixes for CQL3

patch by slebresne; reviewed by jbellis for CASSANDRA-4185

- Fix float parsing
- Refuse more invalidate create statements
- Fix count in select
- Disallow counters in primary keys
Fix CQL3 prepared statements in BATCH

patch by slebresne; reviewed by xedin for CASSANDRA-4202
Merge branch 'cassandra-1.1' into trunk

Conflicts:
	src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
Less strict validation after #4004
Merge branch 'cassandra-1.1' into trunk
CQL3: make some keywords unreserved

patch by slebresne; reviewed by xedin for CASSANDRA-4186
Fix having committed the wrong (old) patch for #4185
CQL3: move {max/min}_compaction_thresholds to compaction options

patch by slebresne; reviewed by jbellis for CASSANDRA-4187
include tombstone size in ColumnFamily.size
patch by Andriy Kolyadenko; reviewed by jbellis for CASSANDRA-3741
Merge branch 'cassandra-1.1' into trunk
fix merge
Merge branch 'trunk' into refs/top-bases/p/4121/01_support_multiple_tokens_per_host
Merge commit 'refs/top-bases/p/4121/01_support_multiple_tokens_per_host' into p/4121/01_support_multiple_tokens_per_host
Merge branch 'p/4121/01_support_multiple_tokens_per_host' into refs/top-bases/p/4122/01_bootstrap_decommission
Merge commit 'refs/top-bases/p/4122/01_bootstrap_decommission' into p/4122/01_bootstrap_decommission
make tools/bin scripts executable
Avoid deadlock in migration stage

patch by Richard Low; reviewed by slebresne for CASSANDRA-3882
Take supercolumn names and deletion info into account in memtable throughput

patch by slebresne; reviewed by jbellis for CASSANDRA-4264
Add back backward compatibility for old style replication factor

patch by slebresne; reviewed by jbellis for CASSANDRA-4294
Preserve compatibility with pre-1.1 index queries

patch by slebresne; reviewed by jbellis for CASSANDRA-4262
Add missing licences and versions for 1.1.1 release
Change build version
Add an option to cqlsh to authenticate to a keyspace by default.
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4108
remove spurious character
revert CASSANDRA-1337
comprising commits ef23335, f17fbac, 9cf915f.
run local range scans on the read stage
patch by jbellis; reviewed by vijay for CASSANDRA-3687
cqlsh: handle fully qualified class names
Patch by paul cannon, reviewed by brandonwilliams for CASSANDRA-4546
remove schema agreement checking from all external APIs (Thrift, CQL and CQL3)
patch by Pavel Yaskevich; reviewed by Jonathan Ellis for CASSANDRA-4487
NPE while loading Saved KeyCache
patch by Vijay; reviewed by Jonathan Ellis for CASSANDRA-4553
fix build
simplify Map/Set usage
patch by pjenvey; reviewed by jbellis
Merge branch 'cassandra-1.1' into trunk
Add way to force the cassandra-cli to refresh it's schema
patch by Dave Brosius; reviewed by Pavel Yaskevich for CASSANDRA-4052
fix for situation when assumtions are read for CF that does not exist (CASSANDRA-4052)
fix type in CQL3 ALTER TABLE

patch by slebresne; reviewed by jbellis for CASSANDRA-4170
Remove other obsolete NEW entry
Throw invalid exception in CQL3 on obsolete options

patch by slebresne; reviewed by jbellis for CASSANDRA-4171
Update versions and licence in preparation for 1.1.0 release
add concurrent schema, cql3, and CFRR wide rows to NEWS.  clarify that KeyRange.filter allows Hadoop to take advantage of C* indexes
fix CHANGES
elaborate on why cache changes matter from end-user perspective
move cql changes to own section of changelog
Pig wide row support.
Patch by brandonwilliams, reviewed by xedin for CASSANDRA-3909
Update NEWS for 3909
avoid generating redundant compaction tasks during streaming
patch by yukim; reviewed by jbellis for CASSANDRA-4174
Merge branch 'cassandra-1.1' into trunk
add JdbcDecimalTest
patch by dbrosius; reviewed by jbellis for CASSANDRA-3837
Merge branch 'cassandra-1.1' into trunk
Remove obsolete line from the NEWS file
Remove other obsolete NEW entry
add concurrent schema, cql3, and CFRR wide rows to NEWS.  clarify that KeyRange.filter allows Hadoop to take advantage of C* indexes
Fix wide row counter deserialization.
Patch by Marco Cova, reviewed by brandonwilliams for CASSANDRA-4181
right seems more right than left
rename clusterinfo command to simply status
Make ViewContainerTabBar and TabbedViewContainer less coupled

In general, those two classes are coupled too closely. Ideally,
TabbedViewContainer should be transformed into a generic enhanced tabbar
which knows nothing about TabbedViewContainer or its user.
models.py: switched on tori/riq calculation
Improve support for targetting a gpsim-compatible 18f4455.  Output is now a count of seconds on PORTB.
Initial commit
Merge branch 'master' of github.com:aeife/labyrinth
[doc] added flattr button to user guide
[doc] documented rst.networkInterfaceName() and mdns.loopbackInterface()
[error handling] added errorCode property to dns_sd errors and exceptions
[error handling] removed stalled persistent v8 symbol
working form that generates a local jira ready issue, next step is posting back
【文化漫谈：“屌丝”文化可有，拼搏精神不能丢】
“屌丝”文化的实质是，底层民众对艰辛生活难以改变和追求幸福力所不逮的无奈嘲讽。“屌丝”文化既根植于社会生态，又离不开个人精神。面对生活的挫折，除了指望政府外，个人也不能丢弃拼搏的精神。

每一段时间都会有流行的网络语出现，现在是“屌丝”。毫无疑问，屌丝文化是一个植根于网络和青年之中的语言现象，大家所公认的是：“屌丝”代表一种放低姿态、非暴力不合作的语境。中产阶层逐渐消失，上升渠道也许正在堵塞，年轻人在沟通能力、生活能力、工作意愿都不像我们的父辈当年，用积极的态度投入生活的今天，“屌丝”一词的出现恰到好处，正好用来自嘲。

在生活面前，每个人都有“屌丝”的时刻

今天是“屌丝节”。“屌丝节”产生于百度贴吧，并通过网络等媒介传播，逐渐形成一种屌丝节文化，流行于广大的自称为屌丝一族。11月14日寓意有二：11月是象征我们“屌丝”的光棍月，14日是毅丝节。二者结合形成“屌丝节”。

什么是“屌丝”？狭义上是指那些无力改变现状而内心充满黑色幽默感觉的社会边缘人群，自嘲是其强大的武器，怀疑一切是方法论。广义上，人人都有“一秒变屌丝”的时刻。

状态一：自身局限

对自己不懂的事物保持敬畏和好奇是没错，然而掌握知识的圈越大，无知的世界也就越大。不了解西方艺术史的人面对“大卫雕像”打马赛克，就会瞬间变“屌丝”；再能干的编辑，接到催稿电话，也会瞬间变“屌丝”；再出风头的艺人，如果影视剧里演技很烂，在有实力的大牌面前也会瞬间变“屌丝”。

状态二：不可抗拒外力

死亡面前人人平等，再有钱有势的人，一提到死就瞬间变“屌丝”；在社会上再如鱼得水的人，遇上病痛也要亲自去医院排队挂号，也会瞬间变“屌丝”；再强的国家，遇到天灾人祸，瞬间变“屌丝”；开车往往是越天胆子越小，再有经验的司机，遇到新手上路，也瞬间变“屌丝”。

状态三：对形势估计不足

再自恋的艺术家，遇到剧院里聊天、睡觉、吃饭的观众也瞬间变“屌丝”；再牛的钉子户，遇到强拆队，瞬间变“屌丝”；甲方虐我千百遍，我对甲方如初恋。对自己设计的方案再满意的设计师，一旦甲方不满意，也会瞬间变“屌丝”。

在生活这张沉重的帐单面前，人人都有“屌丝”的时刻。

网络精神的最核心部分在于以自嘲来消解正统

就在“屌丝”一词甚嚣尘上的时候，不少文化人士都对此表达过看法，有趣的是，他们都陷入难以言说的境地。比如有一位网友发表这样的微博：“屌丝心态就是将个人能力不足导致的问题视为外界对个人本身的迫害。”后来作者删去了这条微博，但并非因为被“屌丝”围攻，而是因为——“屌丝”给她“跪了”！

稍微观察一下就能发现，在这条对“屌丝”不太友好的微博评论里，并没有“屌丝”在破口大骂，而是很多人高呼“女神”、“给女神跪了”这些人显然是反对者。按照一般的网络习惯，反对者应该激烈地乱喷、大打口水战才对，怎么唯独在讨论“屌丝”的话题里，永远都是卑微语态呢？

此前，另一位文化界的网友的一条讨论“屌丝”的微博也出现过这种状况，反对者高呼“高帅富”，又给这位博主“跪舔”了。在这些微妙的语境里，细心的不难看出文化的差异。从语境上讲，一旦自称“屌丝”，就立刻进入自我降格的状态。为什么网友喜欢自我降格呢？

事实上，网络文化中的自我降格现象早已有之。从“贱文化”到“无厘头”恶搞，从“犯二”青年到“伤不起”，网络精神的最核心部分往往在于敢于自嘲，以自嘲来消解正统，以降格来反对崇高。在网络文化里，要区分神圣与卑微、严肃与戏谑、伟大与渺小，是很麻烦的事，因为它们常常彼此混杂，互相冒充的形式出现。看似在夸你，实则在骂你；看似抬高你，却是在消解你；看似一本正经，实则在乱开玩笑；你必须浸入其中，才能直觉地分辨这些细微的差别和片刻之间的语境转换。

在一个自己无论怎么样努力，都难以改变的冷酷世界上，如何对自己遭受的一切保持客观、清醒的态度，并且转化为黑色幽默，是每个“屌丝”的终极哲学思考。

谁知道呢，也许真的有传说中的“屌丝逆袭”。
日月沉浮风云吐，好一个中华民族藏龙卧虎！
岁月是把杀猪刀，紫了葡萄，黑了木耳，软了香蕉。
时间是块磨刀石，平了山峰，蔫了黄瓜，残了菊花。
经历是个开矿厂，挖了山丘，损了钻头，黑了河沟。
当年顶风尿十丈，现在顺风尿一鞋，
哎！！！岁月不饶人啊！
王英：色授于魂，意乱情迷！
天启：啊……不、不可以的……

王英：娘子若肯，我什么都答应。
天启：你想干什么，不要啊……

王英：娘子，你就从了我吧~
天启：不，不可以的……

王英：娘子，咱好好耍耍~
天启：哇，不要碰我的裙子！

周通：小娘子，春宵一刻值千金啊！
天启：去死吧变态！
有一对新婚夫妻
一天老婆问老公：“今天下班晚餐要吃什么饭？”
老公在老婆耳旁轻声的说：“吃你呀！”说完便出门上班去了。
晚上老公回家，一开门就看到老婆赤裸的在客厅奔跑，
老公不解的问：老婆你在干什么？老婆：我在热菜呀！
失去技能之后
公孙老道新版
★超级公孙胜★
技能卡化待完成
Some changes to mocking to allow different stuff to be sent
Merge branch 'master' of github.com:aismail/AndroAR
striving for consistency - rename all underscores to dashes