labofsahil/github-event-dataset-2012 huggingface dataset:
Merge branch 'tundra2_lc' into tundra2_rex
Merge remote-tracking branch 'rex/tundra2' into admino_tundra_2.3

Fixed conflicts in src/Application/DebugStatsModule/TimeProfilerWindow.h
Load Scene Parent id fix: Temporary ugly way to fix laoding .txml files and generating new IDs for all entities. This fixes that parenting will still work after the import. There is no possibility to a much cleaner fix at this moment without bigger code/logic changes. This is good enough for me to fix this issue in the Admino releases though. NOTE: Pending proper fix.
Merge remote-tracking branch 'origin/admino_tundra_2.3' into admino_tundra
Merge remote-tracking branch 'origin/admino_tundra_2.3_parentref_fix' into admino_tundra
TFR-11 GitHub hook update 2.
sebbo hast aufgeräumt
Update iFilger_ConfigUI/locale/french.lua
Updated Makefile.in to include log and date_time compilation. Fixed a small problem with it.
support pgsql function tablesource
refactor
Merge branch 'master' of https://wenshao@github.com/AlibabaTech/druid.git

Conflicts:
	src/main/java/com/alibaba/druid/mapping/MySqlMappingVisitor.java
Fail silently on incorrect number input
Update commands to match 1.3 vanilla commands
Don't send duplicate messages for Gamemode and Time commands.

Gamemode gets sent with the packet.
Add Warning API and settings for Deprecated events
Purge outdated biomes. Fixes BUKKIT-1087
Updated version to 1.3.1-R1.0 in pom.xml for RB
Updated version to 1.3.1-R1.1-SNAPSHOT for development towards next release.
Add spaces to gamemode message. Fixes BUKKIT-2148
Add API for getting and setting experience for BlockBreakEvent. Addresses BUKKIT-2033
Change Player usage in unit tests to proxies
Add API to set and get movement modifiers. Addresses BUKKIT-2205
Merge branch 'master' of https://github.com/Bukkit/Bukkit
o Readd annotations after createMapView
Avancement IA, architecture MVC accentuée
Exciting stuff is working :)
Let the rules switch handle unsupported rules
Add support for email rule
Empty rules, values and errors on Former::close
Poprawa literówek (było rpg_system zamiast rpg_systems tak samo z session)
Signed-off-by: Toney <458820281@qq.com>
Merge branch 'zhujun' of git@github.com:App-coder/xmaicrm.git into zhangjun
Signed-off-by: mxzjzj <mxzjzj@gmail.com>
added Rakefile that runs code coverage, rdoc generation, and unit tests on AppController and NeptuneManager
refactored rake test tasks to use TestTask instead of calling tests via shell
refactored coverage-related rake tasks to use RcovTask instead of shelling out
refactored Rakefile to use RDocTask instead of shelling out
Merge pull request #27 from AppScale/rakefile-v1

added Rakefile that runs code coverage, rdoc generation, and unit tests ...
Updated _posts/2012-07-30-galtian-oath.md
showing real data in designs view + reliability fix
[MOD] RESTXQ: <restxq:redirect/> and <restxq:forward/> elements replaced
      with error calls:
      - fn:error(xs:QName('restxq:redirect', ...))
      - fn:error(xs:QName('restxq:forward', ...))
Fix for implicit @Inheritence
Refactors View rendering into Ember.States:
Use Ember.Logger instead of console.log
Correct state transition name to reflect StateMachine state nesting.
Use standard StateManager send/sendRecursively and convert state method arguments to include options hash when necessary.
d'oh. ember-states needs to come before ember-views
small cleanup
Fixes issue where bindings could only be specified as strings, not actual Ember.Binding objects.
Wrote test to ensure that defining *Binding properties as both strings and bindings work.
Avoid creating anonymous subclasses inside the view helper
Added 'ember-select' CSS class to Ember.Select, as per the convention with other included views.
Add options hash syntax to connectOutlet.

Also, if you explicitly set the `controller`
of the options hash to `null`, it will not set
a controller on the view, and it will be
inherited from the parent view.
Add NoneLocation

I am using this in my own test suite, and it's been working well. I'm
not adding unit tests here, since the logic is trivial, and it will get
exercised by many other tests.
Instantiate Ember.Location implementation from Router

It was instantiated in App.startRouting before, instead of Router.init.

Now we can use string locations when testing the Router in isolation,
without requiring `app.startRouting` to be called.
Clean up location stubbing in routable_test
Use 'hash' as default location implementation on Router

'hash' is a reasonable default over 'history' (pushState), since
pushState URL manipulation requires server-side support.
Router.location cannot be null or undefined
Avoid using HashLocation in tests

It interacts with the browser and might be a source of brittleness.
A route's `serialize` should handle null contexts

In particular, when we are unrouting (in
anticipating of routing due to a URL change), the
default `unroute` implementation calls
`transitionTo` to transition to the parent, but
without a context. In these cases, if the parent
state has a context as part of its URL, it will
try to serialize this empty context, which causes
an error.

This naïve solution just serializes null contexts
to the empty string. Since we are unrouting and
the serialized value will never be used, this
resolves the problem. The long-term fix is to
have a smarter solution than just unrouting.
Use `getPath` instead of `get` in computed macros in order to allow 'foo.bar' dependencies
Merge pull request #935 from joliss/location

Location: Add 'none' location, make 'hash' the default
Datenbankeinstellungen ausgelagert.
closes #21
Change views to themes
Added Modules+Instance function calling!
Plus added a module for doing Socket work that uses instance function calling.
Camera goal problem fixed
4th A
registration now autofills user
fatal error -viesti
adds config file support and singledevicetester helper class
adds docstring to singledevicetester
Use youtube API to start video at the right point
Added in the relations and more populating of the views. Options are now saved.
Merge branch 'master' into JC

Conflicts:
	Phat Beats/CLevelManager.cpp
	Phat Beats/CLevelManager.h
finished
finished
Merge branch 'RalphConcepcion'

Conflicts:
	Phat Beats/resource/Levels.txt
	Phat Beats/source/States/CCredit_State.cpp
...
Took care of all Errors and Warnings- JC
Changes on vizjson
* Removes default header overlay on shared maps
* Adds map view bounds
Migrator now takes lat&lon from redis and calculates bounds if missing
geometry editing wip
added drivers and auth
Merge branch 'master' of github.com:ChrisKozak/Jitney
s/_crappy_/_/g
Update PKGBUILD
Small fixes, man page
Update timestamp only on repo sync
Deliver revoke operation to each cluster site

Signed-off-by: Jiaju Zhang <jjzhang@suse.de>
update docs deploy script a bit.
Work around a PHP <5.4 syntax bug that prevents "new Foo()->someMethod()" but allows "id(new Foo())->someMethod()"
Ninject fixes
Fixed articles edit
FIX: Update release notes.
Disconnect userena messages
Fix padding
Use denormalized attribute
[kde-misc/kover] New(ish) package wrt bug 249232.

Package-Manager: portage-2.2.0_alpha143
[eclass] Add experimental support for assembler *FLAGS respect, wrt bug #432480.
[media-libs/qimageblitz] Testing *FLAGS respect for assembler, wrt bug #431968.

Package-Manager: portage-2.1.11.31
[kde-misc/homerun] Version bump.

Package-Manager: portage-2.2.0_alpha142
[stabilization] Remove obsolete 4.8.5 list.
[stabilization] Version bump list 4.9.3.
[stabilization] Remvoe net-libs/telepathy-0.9.3

handled in bug #441456.
[stabilization] Remvoe app-crypt/gpgme-1.3.2

handled in bug #441956.
[stabilization] Remvoe =app-text/poppler-0.20.4

handled in bug #437610.
[stabilization] Fix rename version desc.
Some basic functionality

Just adding and displaying some stuff to the datastore, bit messy but
working
Fixed body variable leak
WYONE: begun the process of implementing the subtype operator.
WYONE: still working on subtype operator.
WYONE: bug fix for binary output stream.
WYONE: bug fix for binary automaton reader/writer.
WYONE: debugging ... trying to make progress.
WYC: bug fix for try-catch blocks.
WYC: bug fix for parsing functions ending with an indentation.
WYC: correct erroneous test case.
WYIL: copied over modified solver parts from WYONE examples.
fix uninitialized constant warning in CanCan::Rule#model_adapter
Use latest with_model gem

Now with_model clears the association class cache
between specs, which fixes a test pollution
problem.
Fixed problem with 'with_model' gem in DataMapper tests and Mongoid tests.
Fixed typo
Fixed bug with params for actions that build new instances with namespaced models
Pass forward :if and :unless options to the before filter. i.e:

    load_and_authorize_resource :if => condition == true
adding travis-ci badge
Don't remove key-value from the subject hash we might want to use it again.
Just add singleton to description of authorize_resource
adding project status message to readme
Add check for Enumerable as condition value
Merge pull request #607 from Mixbook/master

Added support for value to be Enumerable
Merge pull request #587 from route/patch-1

Just add singleton to description of authorize_resource
Merge pull request #559 from plentz/patch-1

Adding travis-ci badge
Merge pull request #564 from flop/master

False positives on multiple nested abilities definitions
Merge pull request #556 from mauriciozaffari/master

Pass forward :if and :unless options to the before filter.
Merge pull request #505 from nertzy/update_with_model

Use latest with_model gem
Merge pull request #541 from icrowley/master

Fixed bug with params for actions that build new instances with namespaced models
adding a .rbenv-version file
Clarify readme for rails 2.3 users
RLSLog complete - missed something
RLSLog complete - missed something
Removed the colons
Merge pull request #14 from DejaVu/rssfeeds

All merged
Клиент: добавлена отрисовка игроков на поле по мере заполнения комнаты
added a convenient commenting function
Update and fix NEWS
Merge branch 'develop'
dinesh2

sample
Improved translations of menu edit
Translated paper formats and size units in PDF admin page
Merge pull request #385 from marcosgdf/translations

Improved translations
New: possibility to view/edit notes in order card
Fix : table displayed not like others
New : Add clone function on supplier order + global object fetch instead of each case
Task # 608 : forgot to clone lines... Now lines are also cloned and prices are valid prices at the clone date
Merge pull request #494 from atm-maxime/mko608

Task # 608 : add clone function on supplier order
Fix: Set payment term
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
Fix: Works with checkbox htdocs/core/class/html.form.class.php
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop
show local taxes on crabe pdf model
remove unused arrays into pdf models (localtaxes)

Conflicts:
	htdocs/core/modules/commande/doc/pdf_einstein.modules.php

Change-Id: I633bfc4b0ec39f9121662d0f876f1edb36173e8e
add function gettypeoflocaltax and modify pdf models
dont use ES translation for labels
function getTypeOfLocalTaxFromRate now receives thirdparty in parameter and returns array of localtax type and amount/rate. no more sql in pdf model.
Fix: wrong EOL
It connects now :)
It works!
solved weird corruption bug by making everything static
removed useless function
don't need to print buffer
added more fancy stderr output
Added some more functions to be defined in g_expert_system.c

Cmd_Ex_Facts and Cmd_Ex_Instances are meant to be a short hand for facts and
instances.

Quake_Env_Run, Quake_Env_Build, and Quake_Env_Eval are functions meant to allow
access to other environments from another environment.
Added commands to allow easy access of facts and instances

the commands are ex_facts and ex_instances. These commands access the global
rhizome environment
Added commands to allow indirect access to other environments

Quake_Env_{Run,Eval,Build} are three commands that will be exposed into clips
to allow indirect access to other environments. These commands will be exposed
through messages that can be sent to environments.
Modified header/local.h to include SetupQuakeEnvFunctions

This function is referenced by clips to setup the quake env indirect functions
Added SetupQuakeEnvFunctions to EnvUsersFunctions

This makes it so that each environment contains the new quake interaction
functions
Added SetupQuakeEnvFunctions to g_expert_system.c

This is the function that is referenced when defining all of the extra
functions used by CLIPS to interact with other environments.
Added a series of messages meant to make cross environment interaction easy

These include run, run-for, eval, build, facts, instances, rules, and assert.

At this point in time there is no make-instance command. That will be
eventually remedied. The difference between run and run-for is that run does
not take any arguments where as run-for takes in a positive number that defines
the number of rules to run the given target for. If you just want to run an
environment then use run because run-for -1 will fail.
Исправлены тесты, добавлены тестовые данные.
Test for config tool
Module tests
changement de saisie v2.1
Merge branch 'master' of github.com:EdouardF/kiveukoi into Edouard

Conflicts:
	bin/classes.dex
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$id.class
	bin/kiveukoi.apk
	bin/resources.ap_
	gen/com/kiveukoi/R.java
jarlist
Mise à jour du code de login à PIN
Commentaires
Mise à jour de la confirmation du code PIN
Mode portrait forcé pour la saisie du code PIN
update PIN
J'ai grand peur
Merge branch 'master' of github.com:EdouardF/kiveukoi into Edouard

Conflicts:
	bin/classes.dex
	bin/classes/com/kiveukoi/Accueil.class
	bin/classes/com/kiveukoi/Identification$1.class
	bin/classes/com/kiveukoi/Identification$UserLoginTask.class
	bin/classes/com/kiveukoi/Identification.class
	bin/classes/com/kiveukoi/MainActivity$1.class
	bin/classes/com/kiveukoi/MainActivity$2.class
	bin/classes/com/kiveukoi/MainActivity$3.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/R$id.class
	bin/classes/com/kiveukoi/R$layout.class
	bin/classes/com/kiveukoi/R$menu.class
	bin/classes/com/kiveukoi/R$string.class
	bin/classes/com/kiveukoi/R$style.class
	bin/dexedLibs/android-support-v4-ebf406f3e9ed68becfd4294202b77b5b.jar
	bin/kiveukoi.apk
	bin/resources.ap_
	gen/com/kiveukoi/R.java
	res/layout/activity_main.xml
	res/values/strings.xml
	src/com/kiveukoi/MainActivity.java
Bug HEAD
4 box de PIN
SQLite /!\
Merge branch 'Edouard'

Conflicts:
	bin/classes.dex
	bin/classes/com/kiveukoi/MainActivity$1.class
	bin/classes/com/kiveukoi/MainActivity$2.class
	bin/classes/com/kiveukoi/MainActivity$3.class
	bin/classes/com/kiveukoi/MainActivity$4.class
	bin/classes/com/kiveukoi/MainActivity.class
	bin/classes/com/kiveukoi/Profil.class
	bin/resources.ap_
[*] Kernel: Prepare kernel for building external modules after making configure.
OEP-9292: Fixed bug in committing changes from nested store.

We should not have been creating new data hashes in the parent store for
nested records that were newly-created in the nested store.
add useful plugin
add some path
add mv alias
change nopaste mode for default
Reorganised projectand removed unnecessary files
Merge branch 'master' of https://github.com/Epicuri0us/YetiJS
[fix] Class
Added Plan B (for autonomous period)

Not calibrated yet.
Added Plan C

It won't do anything! :D
Some unofficial IPA, more laterals, more nasal releases, more diacritics; fixed ejection mark.
Full implementation of regular connect commands; possibly bind too.
readLog fix for IE
Add convenience method Buffer::getNumBytes
Merge branch 'master' of github.com:Eyescale/Lunchbox
Using reference to the model primary key instead of id
Added license information to readme
Updated version number
play_run画像追加
* Threaded main
Added HTTP timeouts
removed some redundant code and made some minor adjustments, Problems now are: Dropdown dont close when clicking inputs DIV, Hard to update proteins list when closing dropdown by random click, Proteins need to be updated when wires are removed. Please look at my issue.
German documentation for Ambient Light Bricklet added.
[UPD] abstraindo metodo consulte services
Added additional error message.
Added proper shutdown for logging.
Updated to exclude distutils stuff.
Minor updates.
Small fixes in AssistedUtils and InjectProcessor.
added view all todos features and remove list
Update meta data options to current ffmpeg supported options
Removed show-toolbar setting

This is because there is no longer a toolbar.
Also removed some trailing whitespace.
TEST added in test_gqi and RF dni.py is now called eit.py
DOC + RF final touches
DOC a tiny examplanation of GQI2
update:2012-10-03
Added batch upload support (sramp archive package format) to the s-ramp
atom api client.
The s-ramp wagon now expands and batch uploads all interesting artifacts
found in jar, war, or ear maven artifacts being uploaded to the s-ramp
repository.
Improved the s-ramp wagon to better manage the 'expanded' artifacts it
uploads to the s-ramp repository when updating existing maven
artifacts (old expanded artifacts are removed and new ones are added).
Merge pull request #53 from EricWittmann/sramp-66-integration

(sramp-66) The s-ramp wagon now uses the jar2sramp and batch upload features
Added a new parent project for all s-ramp demos.
Added a project to the maven integration demo.  It's a simple
contract-first JAXB project.
Added another project to complete the Maven integration demo.
Got the maven integration demo fully working, and added documentation.
Added a demo of the s-ramp client.
Added documentation to the simple client demo.
Added a demo showing off the s-ramp archive package feature.
Added a query demo.
Added some additional notes in the demo README files.
Merge pull request #56 from EricWittmann/sramp-79-demos

(sramp-79) Added various demo projects
Last second fixes
Made balance changes
Broadcasting message and other stuff
Update map
update server
"T#12_step(1,2) Create a Stub Activity & Launch the Stub Activity on
List Click"
"T#12_step(3) Move the Detail Form Layout"
"T#12_step(4): Move the Detail Form Code"
"T#12_steps(5,6) Clean Up the Original Layout & Original Code"
"T#12_step(7): Pass the Restaurant _ID"
"T#12_step(8): Load the Restaurant Into the Form"
"T#12_step(9): Add an "Add" Menu Option"
"T#12_step(10): Detail Form Supports Add and Edit"
Manifest

Geen thema en permissions
Ghana parser updates for more context
Added fabric deployment script and related modules
Moved Property exceptions from ICanBoogie/Prototype
pushed everything under trunk
deleted crap
fix problem with IP address localhost
Fixing viewport behavior when there are no layers in use

Signed-off-by: Rodrigo Goncalves de Oliveira <rodrigo.goncalves@openbossa.org>
demo
Checks for reading ICC profiles from JPEG files: make sure it starts with the text signature, and return early if no data was found.
Move some common code into ImageFile for creating a fall-back profile.
Better construction of cmsType when reading a TIFF file. Possibly handle CMYK TIFFs? Not tested.
Back to 7.x-dev
Drupal 7.16.
Merge tag '7.16' into moadon

7.16 release
Cleaned up status page, and removed old calendar
fix Goomba
Merge branch 'master' of https://github.com/JacenLakiir/Vooga
WatchedFile#sanitize_name now preserves extensions.
Updated configuration and docs
compile moi ça
Suckas get they wig split
added rotation parameter to SaveAsJpeg and removed GameMakerView references
Small Background fix
fix compatibility with recent merge
Merge branch 'master' of github.com:JieeHD/vr-toolkit
Merge branch 'master' of github.com:JieeHD/vr-toolkit
Add netchips twitter to about screen
Add redcarpet as a development dependency.
Add documentation for the options to Draper::Base.decorate

  - Fix documentation for Draper::Base.decorates_association
Merge pull request #151 from JoeyButler/redcarpet_dependency

Add redcarpet as a development dependency.
Merge pull request #152 from JoeyButler/doc_draper_base

Add documentation for the options to Draper::Base.decorate
no need for creating a new object to get instance methods
Merge pull request #153 from nashby/instance-methods

no need for creating a new object to get instance methods
dfasdfadsfadsf
scaffolded a ton of junk
Some minor changes and additions. The test driver got a bit of a PS/2 interface added to it so it can read keyboard input (and print it on the screen).
修改了无法更新费用的付费方式的错误。在view中应该是expense.payment_id
Add host to Terminal "PS1" to avoid confusion when connecting to VM via SSH.
Add partial support for "parse" to GfStorage
Merge branch 'develop'
Merge branch 'develop'
Städar i koden lite 
Ny branch for ssl
ssl
Merge
Server med fungerande TLS
Merge branch 'sslserver' of github.com:Karolusrex/server into sslserver

Conflicts:
	.classpath
Merge remote-tracking branch 'origin/sslserver' into develop

Conflicts:
	src/se/liu/it3/sn/server/SpiderInDaWeb.java
# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/sslserver' into develop

Conflicts:
	src/se/liu/it3/sn/server/SpiderInDaWeb.java
Merge branch 'develop' of https://github.com/Karolusrex/server into develop
Add web interface (in progress)
Remove .pyc
Update .gitignore
Moved datafile globbing to support zip files in Houston
parseUserAgnet >parseUserAgent
9.4
finish user
#676 Max allowed characters in signature doesn't work
Merge pull request #682 from xillibit/bugs5

#676 Max allowed characters in signature doesn't work
Make menu configurable from the template
Do not delete default template during installation
Fix KunenaView::getModulePosition() echoing output
Joomla 1.5: Fix missing translation in component menu
Display warning if the current template cannot be used
Merge pull request #494 from mahagr/master

Fix 5 small bugs (see below)
Adding some text size to graph labels.
Site updated at 2012-04-06 19:44:57 UTC
pom problem resolving
Remove rotten bits
added copiwrite and license notice
add  mapping data
Latest prototype build 3
Update RS2/Core/Inventory.scar
Added TeoriaNote#atDistance method
Version command

- Update the RPG version command to contain the new Web Manager
Build #2

Core Version 0.1.12
Nation Manager: 0.1.16
Player Manager: 0.1.12
Merge github.com:MC-Story/MC-Story
MOVED FIGURES IN SECTIONS (HAPPY CAPS LOCK DAY!!!)
debug defconfigs
hack038
Fixed portal, though I wouldn't rely on it. Added some stuff

Commented out the dimension travel thing on enderninja.
---
The custom GUI now works for a fact, look at top of screen for proofs :P
Also cleaned some variable names in it for fun
---
Teleporter now teleports you to the shadow realm, however, don't do it
in creative mode because it makes a nether portal and will instantly
teleport you to the nether. Nether portals seem to instantly teleport
you in creative mode instead of having a delay. :/
fixing atreides voices/chrome, mcv, icons, adding structures
implementar los editar de cliente , mascota y veterinario casi listo...(falta utilizar el update)
Changed ordering of pages viewed today
changed referral data to include timestamp, not grouped and filter out baidu and bing searches
[fscot] New site test
[MamutGame] ScrollView Sequence added
[Fscot] Merge
Textarea disappearing issue solved.
fixed firefox 12 issue, removed de-AT from manifest, got letter uppercasing working again
added builds for practicality
Added notes for AsyncTask

If you dont use that, it might become laggy when downloading large images
Fix emails, fix /pol/ flags in cross-board requests.
Mise en place d'un nouveau design général
Renforcement des bordures left-right de wrapper
Restyled a bit
After win32-kill branch merge:
- don't import rwin32 on posix platforms
- simplify TerminateProcess error handling
Test and fix for issue1132.
fix import
numpy: tests for hashability of different flavors of ints.

at least on my machine, int8 through 32 are hashable, but 64 is not.

see issue1148 for more details.
Bah.  Fix test_transformed_gc, which assumes it can override
'transformerclass'.
Improve error message
give test of spawnve minimal environment to run on windows
fixes for mingw (bookaa)
fix for crashing test
Improve error message
add a failing test, so we dont forget
make return value consistent, fixes translation
easy :) fix for test_filter_bug
merge default
now test consistently fails on windows
remove unreachable code (amaury_)
Fix long(unicode, base) with unicode Ropes.

[Problem seen in the py3k branch, with int(str, base)]
kill support for passing integers to bytearray.count. It does not work on CPython
add test and fix for issue 1153
Test and fix for RopeString.find

--HG--
extra : rebase_source : f51f68e3613a3631782a3fb9f36557a0503c5ea8
sters fisier in plus
国士警戒用の判定まで
オリるかどうかの判定…まで
fuuro.hspの移植開始
fuuro.hsp→fuuro.cpp 一部移植
Merge branch '2.0' into porting

Conflicts:
	mjcore/mjcore.vcxproj
Merge branch '2.0' into porting
Merge remote-tracking branch 'origin/tchar' into porting
Merge branch '2.0' into porting
fuuro.cppの移植分をsound.dllに対応化
ビルドできないのを直す
fuuro.hsp→fuuro.cpp 移植続き
fuuro.hsp→fuuro.dll 移植完了
remotenaki関数
enum ChiiType
mouda.hspの移植用ファイルを用意(枠だけ)
makesandBox()
mouda.hsp→mouda.cpp 移植に着手
mouda.hsp→mouda.cpp 移植完了
mainloop.hsp→gameloop.cpp 移植に着手
mainloop.hsp→gameloop.cpp 移植完了
prepare.hsp→prepare.cpp 移植
Merge branch 'font' into porting
yakuクラス定義のファイルを分割
yaku_val1をyaku_sepにマージ
yaku_sepをyaku_concreteにマージ
Added admin check, displays proper dashboard
Always initialize body.
- save the HI-MESSAGE
Update CraftBukkit to Minecraft 1.3.1
Merge remote-tracking branch 'upstrream/master'

Conflicts:
	pom.xml
Bringing AppEngine code over from 'umich' branch.

This is crude and fails to preserve commit history, but given how
tangled the revision history has become, this seems like the most
foolproof way to do this.
Fix to indentation to get tests to pass.
Merge pull request #92 from mdwelsh/merge-umich-appengine-code

Merge umich appengine code
I am gonna kill whoever invented this shit way to network
Add mod_allicons, change module name to uppercase for correct translation
effortless try to add a custom build command for each source file
cmake is kidding me
Bump cookbook versions.
Bump Ruby to 1.9.3-p352 and Bundler to 1.2.3.
Bump nginx to 1.2.6 and Passenger to 3.0.18.
Update vagrant base box version.
Merge branch 'master' of http://github.com/NREL/api-umbrella
Problem with the date.getDay() function solved
edit human
Update exhibitor-standalone/src/main/resources/buildscripts/gradle/build.gradle
added convenience overload to middleman_enqueue and use it consistently in actor_proxy
Binomikekoa muokattu
OpenStock v142

Controle de estoque variavel
Merge pull request #1 from OMDI/Controle-Estoque

OpenStock v142
fixed needsSigning
upped to current sprint version
[Ticket #10633] - Editing patient notes is broken

 * Applied the same fix here as applied to Order Notes in #10558.
 * Also noticed some funny use of &= operator related to action model enablement which didn't make sense.  I removed it.
[Ticket #10319] - Installer should specify certificate CN to be input instead of server hostname

Updated app.config so that default value for CertificateFindType is populated and is consistent with ES.
[Bug #10632] - multi-modality DICOM queries from study browser are broken
 * Re-fixed.
  * The Study Browser no longer stops searching if one of the filtered modalities returns 0 results.
  * Added unit tests for this scenario.
[Bug #10632] - multi-modality DICOM queries from study browser are broken
 * Further augmented unit tests in this area.
[Ticket #10599] - User can enter patient DOB and DOD in the future

 * Added UI validation to prevent entering a DOB or DOD in the past.
 * Did not change the default value for DOB as suggested in the ticket, as this might be a more risky/involved change than we'd want to be making at this point in time.
[Defect #10636] - DataAccess in the WebPortal is broken

* Renamed ServerPartition.IsAccessAllowed() to ServerPartition.IsAuthorityGroupAllowed()
* Added extension method IsUserAccessAllowed() to the ServerPartition class. This method returns true if the specified user has permission to access the partition.
* Updated CC.ImageViewer.Web.Server.ImageServer.ImageServerServerDirectory and StudyLocator to use IsUserAccessAllowed() method.
[Defect #10636] - DataAccess in the WebPortal is broken

* Updated Xian reference
Merge
[Requirement #8151] - Ensure the source code repository is managed correctly

* Keep the open source IS code up-to-date
Preparing release 1.0rc9

git-svn-id: http://orient.googlecode.com/svn/trunk@5057 3625ad7b-9c83-922f-a72b-73d79161f2ea
[maven-release-plugin] prepare release 1.0rc9

git-svn-id: http://orient.googlecode.com/svn/trunk@5058 3625ad7b-9c83-922f-a72b-73d79161f2ea
[maven-release-plugin] prepare for next development iteration

git-svn-id: http://orient.googlecode.com/svn/trunk@5060 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed pom.xml pointing to SCM removing trunk/

git-svn-id: http://orient.googlecode.com/svn/trunk@5061 3625ad7b-9c83-922f-a72b-73d79161f2ea
[maven-release-plugin] prepare release 1.0rc9

git-svn-id: http://orient.googlecode.com/svn/trunk@5062 3625ad7b-9c83-922f-a72b-73d79161f2ea
[maven-release-plugin] prepare for next development iteration

git-svn-id: http://orient.googlecode.com/svn/trunk@5064 3625ad7b-9c83-922f-a72b-73d79161f2ea
Fixed pom.xml changing release version to 2.1

git-svn-id: http://orient.googlecode.com/svn/trunk@5065 3625ad7b-9c83-922f-a72b-73d79161f2ea
* [hello] add some doc
blabla
Se pueden crear recetas
Added incase-sensitive matching for user lookups
make it not so pretty
update README.pm (description)
Nuevo Control jQuery FancyBox
Решение задачи 2 (метод Гаусса)
Wersja od Tomka :)
adding backbone stuff
Del cache upon post trash / untrash
Clean-up
Initial push of customizer API integration into the plugin
In a more stable state...
Integration works, bitches...
fixing integration JS form customizer and in admin panel
Load default theme opts + upgrades galore...
Typography works for the most part--colorpicker not cooperating + needs more styling love...
Typography control styling
Updates...
More updates...
Quick Fix
Theme Switching finally works...needs polish
Re-ordering sections, etc.
Adding global JS var to prevent iframe busting from hosted-plugin
Sometimes the most satisfying commits comein very small packages...
Toying with this...
FINALLY able to prevent redirect on theme switch in the customizer w/out editing core...very tricky implementation WP, very tricky indeed...
More controls..
Lots of changes...big improvements galore
Stashing changes...
Rev'ing with head of BP 2.5 staging branch
Added initial content, let's see what this looks like...
Added check for angles of the rect
widgets are using deprecated mediafield

disable for now
Updated release notes for gh-148
assign categories to created catalogs
Implement ajax for the grid row reordering.
The server view is still unfinished, it does not really reorder yet.
Qt5: Added info about Qt version into session files.

It will break restoring sessions from Qt4 into Qt5.
QupZilla can now run with Qt5.
(there are still some issues to be resolved)
Fixed rendering issues in ListWidget in SiteInfo

It should now be rendered well with all possible
font sizes.

Closes #663
AdBlock: Improved performance in 2 types of rules
- ||domain.com^ and anything| rules are now using string matching
- edited updating EasyList to download more rules
   * only 50 rules are slow now (use regexp) in EasyList
AdBlock: Option to delete rule with Del key
- fixed setting color of newly added rule according to its type
remove node static from package.json
добавил ссылку на финотчёт за июнь 2012
http://dev.rosyama.ru/bugs/show_bug.cgi?id=169
http://dev.rosyama.ru/bugs/show_bug.cgi?id=44

http://dev.rosyama.ru/bugs/show_bug.cgi?id=70
"this" isn't referring the right object as he is placed inside an anonymous function. I changed "this" for "instance" as it's defined on line 808.
updatet cmake file to automatically build r2d, r2d as a submodule
Переход на pyCharm.
Начальная реализация правильного расположения людей во второй таблице.
Update the RESTful interface: allow types to be specified

The current checker limits its checks to NS records, but by extending
the RESTful interface slightly we now also support queries with a
different type, for instance:

    http://miek.nl:8080/check/example.nl/SOA
Fixed Defect CDT-63
Added function administrative.get_concatenated_name for improvement in rrr table #217
Merge branch 'master' of github.com:SOLA-FAO/database
More fixes for convertible-to-bool changes in boost smart ptr
Fix logging output.
Revert "Removing function prototypes from hpx_fwd.hpp"

This reverts commit ead77e172741a9774341acfed00a6b046e166d98. Please leave
set_error_handler in the API. It is used in octopus.

Conflicts:
	hpx/hpx_fwd.hpp
Revert removal of exports that causes runtime breakage due to linker behavior on Linux.
fixed futures in generators mode
API CHANGE: require('streamline') --> require('streamline').register()
API CHANGE: require('streamline') --> require('streamline').register()
fixed bug in what makes the title
Merge branch 'master' of github.com:Samfundet/Bedpres
Login form gewijzigd
Een bult wijzigingen

-Vacature edit error gefixt
-Vacature admin_show error gefixt
-Edit competentions backend gefixt
-User competentions worden verwijderd als user wordt verwijderd.
-Vacancy competenties worden verwijderd als vacature wordt verwijderd.
-Competenties kunnen aan vacature worden gekoppeld
Vacancies en notices fixed
Added ella-taggit application.
Refactored Publishable resource (filtering).
Call parent method `dehydrate` when override it.
Changed `assert_true` to right `assert_equals` methods.
Added better error messages for tests.
Renamed `PublishableTagResource` to `TagResource`.
Reorganized import statements.
Added API to access all collected resource classes.
Tags in all publishable objects are working (I hope).
Added example cURL commands for handling tags.
Added command line option '--nocapture'.
Added result object as an argument to the update method

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
Added interface-update example to Commands

Signed-off-by: Ravn T-M <ravn.tm@gmail.com>
binlog: improved logging output
binlog: add note about malloc
binlog: add note about corrupted entries
binlog: use passed filename insted of dup
binlog: add newline to all logs
binlog: fail only if error happend
data-sort: explicitly include string.h
rbtree: do not redefine offsetof
Merge branch 'devel' into binlog
Merge branch 'binlog' into data-sort
added request as dependency
Added member check for warpcore
added config params
update header version for beta3
Merge branch 'branch-6-2'
[t1826] updated popcorn repo to get googlemaps fix
[#1727] wires and functionality to imlement custom controls using just css and html.
[#1792] CSS fixes.
Updated the show_bar part of put_ui_to_window. Energy and HP now works with various hp_max and energy_max !
What we demo'd with
Merge branch 'master' of https://github.com/SenorRobot/SenDes
fixes for stripping slashes
Adding phpunit and a first, ever passing test
Adding travis.yml
Set the background view to nil when setting view background color. This is required for the background color to display properly in iOS 6.
Merge pull request #532 from ptackbar/master

Fix table background view color in iOS 6
Namespace C headers and Fortran modules

These are now installed to `include/xmdf/` rather than `include/`. This is
mainly to keep generic names like `ErrorDefinitions.h` from clashing.
Import of source from XMDF 2.1 release

This is an import of the source code from the 2.1 release of XMDF:

  http://xmdf.aquaveo.com/xmdf_2.1.zip

All library source code has been centralized in a src subdirectory and
converted to UNIX line endings. No other changes have been made.
Update build scripts for 2.1

Update the version number to 2.1.0-1. Also, XMDF no longer uses version 1.6 of
the HDF5 API.
Update for include structure used by 2.1

Version 2.1 of XMDF has sandboxed the header files in an `include/xmdf`
directory. Update the build scripts to handle this change.
Replace calls to H5Eget_free with calls to free

Same rational and change as used for commit e71ec5c.
Include upstream changelog

The file `changes.txt` is now included as `upstream-changelog.txt`
Update README for 2.1-1 release
Cambiado datos capistrano
Added new option - Lite Button Bar on mouseover.
Added 1 option from ShestakUI_Extra.
Converted to a gem
Close button, oh my
Const correctness
Typo
Add D bindings
Code::Blocks project, kleine aanpassing aan code voor gcc compiler
Work in Progress

- Started documentation of the Solution proxy object.
- Aliased the EnvDTE.Project and EnvDTE.Solution objects in the
solution proxy.
- Added a text file that contains legacy macro code for generating
documentation comments. This will be translated in the future and
added to the VSIX project so the functionality can be used outside
the context of a macro.
Added Database Connection Window

Added the window that will allow connecting to databases for procedure
enumeration. Did this as a basic proof of concept on how to create and
add WPF Dialog Windows within an extensibility project.

This commit represents the most basic implementation of windowing for
the application.
SONAR-3065 API: add jQuery
Prevent clearing of teleport pending flag until position update packet is sent
Added Cuboid update methods for chunks/regions/worlds
- These methods lock the blockstore
- It is important that chunks are locked in the right sequence
-- NOTE: don't lock chunks unless you know what you are doing
- Added CuboidBlockMaterialBuffer, this stores material and data
- Updated CuboidChangeEvent to use cause instead of plugin
Make commands a source

Signed-off-by: Chris Sanders <NinjaZidane@hotmail.com>
Make the textboxes fade away.
Getting textbox fading from upstream.
Make textbox fading fade in the right direction...
Get textbox fading fix from upstream.
Make the textbox fade-off exponentional and give it a fade-on.
Get TextBox exponential fade-off and fade-in from upstream.
More TextBox fading work.
Fading tweaks from upstream.
implémentation du solde prévisionnel sur la page d'accueil des comptes
mise a jour problème conflicting bean
other colinn's
Added mouse map to CTags preferences menu
Bindings and documentation cleanup: Added new keybindings of 'ctrl+>' to jump to definition and 'ctrl+<' to jump back. Fixed README to reflect proper binding of 'ctrl+SHIFT+left-click' for jump to definition, and added 'ctrl+shift+right-click' to jump back. Added symbol list commands to command palette.'
r27.5-need to update this too
Expand Pokemon.setDefense() to include HP and retreatCost.
changed posix_spawn so that x applications are located, rather than hardcoded
assembly change and more doubles
tried to add in the login data in advance
Reformat ant file
make TestISODate not tck depend upon package scoped implementation
Test for HighPassFilter, LowPassFilter.
Refactor interface Handler to abstract class Handler.
Add for PanTopmkins algorithm: DerivativeFilter, Squaring, Integration.
Add a LloadBuffer that takes a size parameter.
added days_ private member of optimizer. refactored optimizer variable names.

private member variables of optimizer now have trailing underscore in their name.
update "disqus_url" since I did the Disqus migration thing
add the versions controller
match error signature and use update method
Made some changes to configs and revamped yummy
going back to the old yummy setup
Merge branch 'master' of github.com:TyOverby/dotfiles
merged
Merge branch 'master' of github.com:TyOverby/dotfiles
scan decimal literal
literal token to string
Adding the ability to transform and resolve email address as user ids.
Merge branch 'ADDON-#1' of git://github.com/mmoayyed/cas-addons
Polish the merge
Added a modified resource check as the scheduler could be configured with multiple different resource change notifiers e.g. svs reg, complex attribute DAO, etc.
Fixed SASS error + 9bd655e
* Added config for heroku
* Fixed Procfile
* Added bootstrap css / js
* Added an index placeholder to show it works.
Update src/cvhplugin.h
photochange8
Respect client recording priority in htsp_method_addDvrEntry
New Emley Moor Muxes
Correcting fechp value for 690000000
Add more strict check for duplicate recording entries

It is better to have duplicated data than splitted ones. Also, we
can use more DVR configurations with different parameters.

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Added muxes for Kabel Deutschland
add ability to disable subscription when mapping
Some Path Fixes
Some more Path Fixes
Reloads EPG Livegrid every 10 minutes
Hide System log by default.
Fix TV Logo margin on EPG
Some EPG Popup design fixes
Raw Teletext
Add more strict check for duplicate recording entries
It is better to have duplicated data than splitted ones. Also, we
can use more DVR configurations with different parameters.
Added muxes for Kabel Deutschland
Merge branch 'Partugal/patch-check-subsc' into patches-testing
Merge branch 'pr/n105_lens187' into patches-testing
Merge branch 'pr/n68_perexg' into patches-testing
Merge branch 'pr/n29_nemphys' into patches-testing
Merge branch 'pr/n50_jamiejones85' into patches-testing
added new slides, folder with pictures
Add for merge conflict
Improved README files. Removed unused template content.
kokeilu commit
Removing some debugging output.
#51: When a server goes down, the clients also close gracefully with a single stack trace.
#76: More caching for the way stats are drawn. Removing multiple Dimensions allocations.
Fix #73: Move_Cool_Down re-work broke the way weaknesses are calculated and made some creatures unable to move.
#44: Enemy movement speed has been nerfed.
Rename Mana to Energy to better reflect terminology used in the documentation.
Copyright updated. JSON parsing fixed with other engines than Webkit.
Merge branch 'osm-plugin' into sankore-icap
First Testupload
asd
Updated the changed doc
Improved the README file to use markdown syntax
Started Utilisateur management #111
static pages added
Statics done
Update test2/src/test.java
Fix the cuda extcopy code.
update free.php
fixed the syntax error, but the summary tag does not show up
Initial Commit with demo project
number of vlan
number of vlan 2
Finished Rspecs for xml querying. Fixed sold_out and image bug
Merge branch 'xml_database' into front_end
Deleted DB cucumber
some annoying bug with spans
commit before merge
 merge conflict
gemfile changes
basic views and controllers for recommendation form, 'custom' tab
recommendations controller
fixing flow of pages for custom recommendations
commit to pull
refined recommendations form style
testing
Merge branch 'master' of github.com:ackermanir/tixbay into styling
process category recommendations, cucumber tests
figuring out how to write tests for  pagination or scroll loading features
cucumber tests for scroll and pagination
Merge branch 'master' of github.com:ackermanir/tixbay into scroll_page
pulled from master
Process of making cucumber tests
finally got cucumber to work, due to ruby version issue
views for form (date and location)
more tests
wrote some very basic features for infinite scroll
Removing unnecessary remote control use in functional tests
blockquote highlighting, incl. scrolling to the first one
tests
tests
Rearranged tests in own directory.
add procfile generator
Finished the main koans.
Adding wifi-signal-strenth to dotfiles
Fixing permissions
vectors & keywords
Wheel tweaked to require only position on parameters
[BUGFIX] Fixed incorrect behavior of StructuredPropertyCollectionConverter
Use of get_object_or_404 shortcuts instead of try/except
removing assert-Failing
syu with just yaourt
instapaper command to pentadactyl
sending bitmap by serial for 12864
gui ability to run groovy script, with rest support, and util classes to intercept stdout/stderr; plus style tidies
client tell mpd how to behave
Lexer returns null when null, empty on blank text
src/lib_file.c: File-handler functions need FILE- prefix
Use defaultdict where appropriate
Clean up MongoDB access
Disable sigpipe on Mac OSX

Use setsockopt(SO_NOSIGPIPE) on platforms that don't have MSG_NOSIGNAL
and do have SO_NOSIGPIPE
Auto-create alaparser

- The Alaparser object is now auto-created at world boot, for easier
use.
- Updated readme.md
Add connect timeout and reconnect to mysql
app.start/stop: only call managed children

- Changes StartableMethods to only call managed children, to avoid
  errors about "Management context not available" on pre-managed 
  children.
Pre-holiday changes
move old files in new folder "obso"
rentame test classes in inheritance-tests.js
new analysis js classes
rearranging
misc improvements, e.g. 'assignment vs. comparison' and '0/0=-3'
Added base user class
Added IP tracking
Worth Starring: Components
Not move array boundaries when start is already on array start. Close #13
Checkout to branch if it is already created
Swap ctrl and alt keys
添加双击一个 host item ，可以让此 item 进入编辑框的功能
Added links and classes to carousel items and more links to footer
Added links to carousel items and tweaked carousel speed

Also added keyboard accessibility (focus scrolls item into view)
Inherit from StandardError, not Exception

Inheriting from Exception is not good practice, as it encourages
"rescue Exception" which is almost always a bad thing to do
(e.g. SystemExit).
Move RecordNotFound to a more global location
Put the stemming exceptions in alphabetical order.

As spotted in @tarastockford's version, this makes a lot more sense for
diffing and searching.
Allow passing in the param_filter through config for secondary solr index
Don't specify port
Added stderr to bootstrap
Added fps interval suffix and fixed issue with 0.bmp or 1.bmp
fixed plugin activation
Pop up the modeless rating dialog without the help of TBHintView
Finished PhysicsGun class and got HeroArm working really well. Still
working on TurretBarrel.
Fixed signal names in top-level file
Saving for future reference
Add ISO8601 parser for mtime, ctime, atime, crtime, and dtime
Replaces system output with logging
Cleans up initialization code
Cleans up some class names
Toolbar & Preferences have fixed order
Fixes the order of sheets
Fikset paths
Lagt opp tunnelscripts
Fixed autodetect of free port and possibility for local mapping
Added a fav icon to static/img folder - @andrijan please make it work :)
All updated change for report
edit index.html in public
Creacion del proyecto TICIL 2
Creacion del proyecto TICIL 2
Creacion del proyecto TICIL 2
Creacion del proyecto TICIL 2
Creacion de Helpers
Creacion de Helpers
Creacion de Helpers
Creacion de la plantilla y los helpers de la vista,
Creacion de la plantilla y los helpers de la vista,
documented changelayer plugin
minor: replace tabs with spaces
Merge https://github.com/angavrilov/dfhack
Track structures
Track stonesense
small changes to tools(lua)
Merge branch 'master' of git://github.com/peterix/dfhack
Extern "C" mess fixed, bitlib mess fixed, bitlib added to autoload.
Fix sscanf parsing the memory map on linux, so that dfusion loads.
remove DotZLib.dll, no longer used
histone-javascript@trunk -> histone-javascript@dev
small fix for version mysql blowup, need to use stringstream or boost lexical cast
Even better way (C++11 ftw)
Merge pull request #258 from Kronos11/develop

small fix for version mysql blowup, need to use stringstream or boost le...
Set up Kinetic.js grid