labofsahil/github-event-dataset-2012 huggingface dataset:
Store source code in the instance
Fixed ent:mass()
Preprocessor FindComments fix and multiline strings support
Made starfall screens display error only to owner
Added new examples and useful code snippets
Fixed GM13 related stuff (continue)
Updated info.txt
Starfall Screen now displays error on screen
Starfall screens run on server and client.
Removed debug code in umsg lib.
Made use handle correctly when a screen is a shared screen.
Setmetatable is now the original function, changed Vector/Angle/Matrix protection
Merge remote-tracking branch 'daranable/clean'

Conflicts:
	lua/starfall/libs_sh/builtins.lua
Merge pull request #33 from Cenius/dev

Preprocessor fix and examples
Merge branch 'master' into coroutines

Conflicts:
	lua/starfall/libs_sh/builtins.lua
Upload

Uploaded files.
roomservice: fetch mr1-staging

Change-Id: I17217122e9a007aeaa9152a7eac046f32d0690f1
update social button url
Generates RSS feeds now. Works well enough for my purposes.
RLS1.0 remove some bugs

The bugs of mouse move checking are removed for the release version.
Removed unused dump helper, and added a namespace to remaining helpers.
Step15 GUI completed
bce: Rework MSI checkout for 5706 and 5708
bce: Dispatch callouts to interrupt's target CPU
fsstress: Adjust the sample script a bit.
Introducing the JPA plugin, to compute the list of (external) mapped
classes in persistence.xml automatically.
Introducing the JPA plugin, to compute the list of (external) mapped
classes in persistence.xml automatically.
Adding bidirectional links to MSI.
attempting to show map is loading
Fixing datasheet editing flow
Return an error numeric instead of just refusing the command if we don't get enough parameters for PRIVMSG or NOTICE
Internal - Bomb Merging - Creating bomb merging, need to work on scaling a bit more and create/find a free for use icon.
Merge pull request #8 from EpicFailInc/DeathAndStuff

Internal - Bomb Merging - Creating bomb merging, need to work on scaling...
pushed to make dayz show up

Signed-off-by: CJ <Chollis81@yahoo.com>
Name von Klaus sein Auto angepasst
Merge branch 'master' of https://github.com/ErikWitt/CarAssist_iPhone
"Profil" in die Navigationnar eingefügt
Merge branch 'master' of https://github.com/ErikWitt/CarAssist_iPhone
Hintergrundbilder in heller Variante aufgenommen
fix bundler paths
Put ifs into switch in create_part. Delete useless PSv saving function.
ArticleSmall, initial support
did some optimizations
Initial Enemy Implementation

Enemy implemented
Cool is over rated like in highschool!
fixed key logic in Enemy
Started support for running in terminal
Concatenating from terminal is now supported
Fixed error with non-existing phrase
Merge branch 'development'
Restricted permissions more tightly
Improved number to hex array function.
Added initial version as generated by ADT's two-pane template.
Added universal makefile.
Modifications related to git
[maven-release-plugin] prepare release SteelSeries-3.9.27
2nd try...
[maven-release-plugin] prepare release SteelSeries-3.9.27
3rd try
[maven-release-plugin] prepare release SteelSeries-3.9.27
4th try
[maven-release-plugin] prepare release SteelSeries-3.9.27
sorting quote reply result by cheapest total charge prices
Delete Backup of favicon
Update Active Admin Site Title and Devise Reply Email Address
Unify retornando Option
all but video is ready
Added rigid body class.
fix typo: congiguration
err
Finalized recherche
Final
testing git
revert http example

didnt mean to commit this, sorry for all the "misc"
commits while I was playing around :)
removed rest of http example
check data array for existance of user key before deleting
call shadow init - 2.29.9
cwiczenie2
完成权限系统！
make embedded odm translations work
eclipse java code formatter
http timeout can be set via input hash
added the total method for carts and fixed a lot of tests
Projeto adicionado ao GIT

Projeto adicionado contendo todos os arquivos necessários para o
funcionámento. È importante relembrar que o banco se faz necessário
normalização e sistema ainda não está com interface final.
added cmake build file for process subdir, fixed the others
Reduced the complexity of the update method to 10.
WAHOOOOOOO!
Merge branch 'master' of git://github.com/TylerOrr/AngrySomething.git
Merge branch 'TylerBranch' of git://github.com/TylerOrr/AngrySomething.git into TylerCopy
Merge branch 'Restructure' of git://github.com/TylerOrr/AngrySomething.git into TylerCopy
Added TestA.bmp, TestB.bmp & TestC.bmp to directory
Merge remote-tracking branch 'group/TylerBranch'
fixed bug in collision detection. detects collisions with virtually no bugs at velocities less than 5. Need to change collision handling to make collisions dependent and to change velocities based on velocities of colliding objects (not self).
changed collision handling to alter velocities based on velocities of colliding objects instead of self.
fixed bug in DrawableObject::draw(). Added gravity to physical object and cleaned up code in PhysicsEngine
Added mechanics engine, put all object types into a super object for testing.
Merge branch 'TylerBranch' of https://github.com/TylerOrr/AngrySomething.git

Conflicts:
	DrawableObject.cpp
	DrawableObject.h
	GraphicsEngine.cpp
	GraphicsEngine.h
	Object.cpp
	Object.h
	PhysicalObject.cpp
	PhysicalObject.h
	PhysicsEngine.cpp
	Room.cpp
Added mass to PhysicalObject and adjusted collision handling to make collisions dependent
Added Mechanics implementation
Changed structure of type identification for Objects and changed constructors
Changed constructor for Object
hi
started implementation for circular object collisions within Physics engine
Merge branch 'master' of git://github.com/TylerOrr/AngrySomething.git

Conflicts:
	MechanicsEngine.cpp
	MechanicsEngine.h
	Object.cpp
	Object.h
	Room.cpp
Created Sling -
	Takes user input to move the sling around and spawn a MultiObject
	Will eventually spawn a Monkey with intelligent velocity and accelleration

Created Slingshot -
	A drawable object whose only purpose is to draw a slingshot to the screen
	Will be implemented into Sling eventually
Working Slingshot implemented.
Font, changed products to services, add a transition for the nav.
saubiman: Form and empty Reposclass added
die dritte Aenderung
Revert part of "Several SQL related fixes." Create script should not be changed
Bugfix in BasicHomeExtraInfos.xml
Yet another intermediate commit!
The DVB-IP classes are now cleaned up - more code reuse and all ICustomDevice graph state change callbacks fully supported. Fix for #3706 is included in here.
Made some controls semi transparent (Mantis-4094)
Fixed one more copy and paste bug
Fixed crash with bottom-up adjacencies

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@148 66977474-1d4b-4f09-8fe9-267525286df2
Turned off doxygen warnings

git-svn-id: http://www.openvolumemesh.org/svnrepo/OpenVolumeMesh/trunk@149 66977474-1d4b-4f09-8fe9-267525286df2
Merge branch 'master' of github.com:MikeKremer/OpenVolumeMesh
facebook connecting!!
te escribí un mensaje
Debugging.

Signed-off-by: Robert Xu <robxu9@gmail.com>
Some Chat Stuff

- Now Handles Chat Formatting
- New Config option for Chat Formatting
- New Permission: ec.chat.color, this will allow the player to use
colors in their chat messages.
- Now Requires Vault to run.
Fixing bug in ms-workspace
Even more derp
wording in Obj-C sample
Ruby: move from HTTParty to Rufus::Verbs

Also, show how to make images available offline.
Update STATUS.md
Same again ;)
brief description added
Upgraded to Foundation 3.2

Added .gitignore for OS files and sass-cache
Upgraded to Foundation 3.2

Added .gitignore for OS files and sass-cache
Compressed PNGs
updated functions.php and javascript files to 3.2
Add NavFieldTest 1.6 ipa.
Fixed PIC ICSP.
Missed a semicolon there...
Updated deleteBrochure, deleteImage,deleteVideo,downloadBrochure,downloadImage, downloadVideo and getAlbumImages.
3 лаба

работает только с двумя файлами :(
Add field Number of votes
Fixed git package name in README
BACKLOG-471 check if connection is allowed between IdP & SP
Tidy up defconfig
empty: bump to EAPI 4, add metadata, fix QA issues
scanmem: fix QA issues, add metadata, fix dependecies
add ebuild for vtun with fix for build-time racing condition
remove lirc ebuild, fixes is in main tree
remove mednafen 0.9.21 ebuild because it is in main tree now
improved response building for impressions. building for feedback and errors to follow up.
now we can process feedback and error messages as well :)
we can process messages with unknown data now
changed console output to only see recommendables when impression is processed; some indentation on a long line
Merge branch 'master' of github.com:PragTob/CoffeeRecommender
Core/Auth revert most of the changes from commit f2f8970c273c9dd0365e02170b3078aa5e37eb9d
* made couple slight adjustments.

this was not a good fix. nothing changed but dropping our name.
We are but a Suburb of TrinityCore City (lol at analogy),
with this it entitles us to bare our own name and signature on things within this project, as well to have our own set of rules and policies.
ONE of which approval must be given b4 trinity ports...

Signed-off-by: Bootz <bootz@projectskyfire.org>
Merge branch 'master' of https://github.com/ProjectSkyfire/SkyFireEMU into mmaps2
Merge branch 'mmaps2' of https://github.com/ProjectSkyfire/SkyFireEMU into mmaps2
Fixed test script manifest loading issue
Adding prepare perception action
Fixed prepare perception action
Merge remote-tracking branch 'cobgroup/master'
improved MoveArm actions - tested on cob
Merge branch 'master' of github.com:RC5Group6/research-camp-5
added GA tag to basic template
made basic modifications to html5 boilerplate
renamed stylesheet
Merge branch 'release-0.7.0' into develop
прикрутил систему деплоя fabric. завел там команду для выкладки нового кода. Сделал миграцию
fix
Merge branch 'feature/deploy' into develop
Bumped release version to 0.8.0
Merge branch 'release-0.8.0'
Remove #import "RKReachabilityObserver.h"
Created a Sign Up page and associated user jack/plug methods. Also refactored the filesystem plugs to use a single FsPlug class.
followers + microposts
at91: ariag25: add leds/onewire

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Revert "Implemented and tested the actuator_pwm_arch files for Omap_ardrone2 succesfully. To Do: implement an uplink to the UAV and read the Batterylevels into paparazzi. GPS should be finished soon."

This reverts commit d25e7d16b615c99d4803fa5365c435ec2a9b2d0b.

Conflicts:

	sw/airborne/boards/ardrone/navdata.c
	sw/airborne/firmwares/rotorcraft/main.c
	sw/airborne/subsystems/imu/imu_ardrone2.c
Added radio control for rotorcrafts.
Temporary removed timers in main, which need to be fixed.

Conflicts:

	sw/airborne/firmwares/rotorcraft/main.c
Made a begin with the gps sirf protocol.

Conflicts:

	sw/airborne/subsystems/gps/gps_sirf.h
Implemented sirf, but needs to be tested.

Conflicts:

	conf/airframes/ardrone2.xml
Added some battery libraries, these are taken from blog.perquin, was working on ARDRONE1, not on 2 yet. Fix later
For now set battery level hardcoded to 12V.
Fixed warning in wifi.c
Added actuator driver files.
Adjusted flightplan
Fixed the GPS Sirf
添加大量注释与调整方法顺序
Deletes
Merge branch 'master' of https://github.com/RufusMbugua/CakesDelights

Conflicts:
	application/models/models_cakesDelights/m_cakes.php
	application/views/cakes.php
conflict
Added admin settings module and added grading by attempt to frontend
added jquery
added creature description
added creature avatars
fixed #297
added unit tests for SEND/DELETE oneway requests
INCR to v3.9.11
Hard-coded factory, lassat, and satellite uplink limits disabled.

Attempts to disable hard-coded factory, lassat, and sat uplink limits, so that rules.js, multilim.slo, and multilim.vlo can handle said limits without interference. (Unknown if this would work as intended, or has any unintended side-effects.) Would fix ticket #3775 if it works.
Protocl version 51 for Bots
tons o stuff
removing cluster stuff
updating gems
rob fixes
traverse to image if it is inside Plone, don't make an external urllib
call
Update gems

Last time it looks like rake v10.0.3 wasn't fully distributed across the
RubyGems CDN or something. Hope it works this time.
Merge pull request #10 from SmartReceipt/update_gems

Update gems
Add support for deleting receipts
worked on order_details, padded cc_exp, saved order_items when order is submitted
an empty project with character controler
Merge branch 'master' of git@github.com:SophiesGames/SGRepository.git
Remove Spigot from dropdown until it works D:
Updating develop branch with corrections to Disc block
Updates bootstrap and jquery. Modified DISC block stuff, moving .js file out of CentralAZ custom and into core.
Merge pull request #82 from swedd/develop

DISC - round 2
Flowers now use one block ID
Add a new option to allow one to create an archive (ipa) from an existing app by specifying it's path.
Fix some date validations, JS syntax errors.
テスト開始、メソッド整備中。clustersの初期化コードを追加した
リストの挙動を確かめています
リストの挙動を確かめています
リストの挙動を確かめています
Removed object files and temp files
Build kernel for various devices if prebuilts not available

Change-Id: Iff43751930d05472d7715f0d37677ba484e2fa7a
Removed vendor check

Change-Id: I9312b32847dc4ded66eaab9017f99d31e0dd81a1
Match retail Tuna sound package
Put the current degree level setting of the student's degree into the submission
fix forum scoping
Added GUI table choosers.
Criado Entidade Curso
ViewRenderer now selects stage renders by the currently rendered stage name
Auto-fixed imports
Adding metadata to the repo.
Fjernet sjekk av at brukeren er blant participants på rejectedmessage,
ettersom vedkommende allerede er slettet derfra.
Fix disappearing pulse rifle bug
mover team code semi-rewrite

the code was and still is nerve-racking
noclip, notarget, give, and godmode usability improvements

- godmode protects against everything (except suicides via the kill command)
- godmode can also be toggled when dead or spectating
- noclip, notarget, and godmode retain their status until explicitly toggled (except when outside of devmode, or when reconnecting), notably, they are not turned off when switching teams or suiciding
- funds can be given also when dead
- noclipping players do not activate any triggers
- map geometry does not interfere with noclipping players when it comes to changing classes
fix noclipping players affecting other players

notably, other players were able to stand on the "center" of a noclipped player

set an r.contents value of 0 for noclipping clients, backing up the r.contents value in the new ent->client->cliprcontents field
make wrap caching a bit more secure (handle corner cases)
fix distortion of 2D acceleration

"2D acceleration" is the use of the forwardmove and rightmove controls to gain speed in a direction in scenarios where the upmove control does not give you a 3rd axis of freedom (when not swimming, not climbind a ladder, and not noclipping, ie., walking on a surface or falling in air), but may give you secondary movement abilities (crouching and (wall)jumping).

when accelerating in 2D, in many cases, a non-0 upmove value (perceptibly) lowers the acceleration output of the forwardmove and rightmove controls. for example, players accelerate slower in air (and can't reach higher speeds in some sense) with the jump key held down. this is more significant for marauders when executing multiple walljumps while keeping the jump key down, but is generally significant for strafejumping.

the fix is to differentiate between 2D-based and 3D-based acceleration types (eg., walking vs noclipping).

the patch also removes a couple of obscure modifications of the usercmd_t::upmove value, and, as a byproduct, it fixes the case where you are not able to swim up with the jump key if you ran out of stamina.
use floatint_t instead of pointer casting in some cases
fix up some buffer length logic
make strrchr() and strchr() standard-conformant
fix a bunch of OB1 errors
fix an OB1 error in Menus_CloseAll(); the consequences are unknown
increase MAX_SAY_TEXT to 800
increase MAX_BUILDLOG to 1024
Support debug info in dexmerge and fix max blowup of annotations

Support debug info in dexmerge.

Bug: 4090053

(cherry-pick of bc23c4f3ebaefebb3f1be7732767631f91e165ea.)

Change-Id: I1108933fc03330ff91be3a2edef8b4966977dcd7
Signed-off-by: Jesse Wilson <jesse@swank.ca>

Fix a bug where debugInfos' size wasn't being computed.

Previously debugInfos' size of 0 caused a malformed dex file
because debug data was present but not mentioned in the table
of contents.

Change-Id: I07171aaee12fef9f303fc505909f44ef1a714114

Fix a bug where the max blowup of annotations was incorrect.

I'm not sure where the 1.34 number comes from but it's incorrect.
From the spec, the encoded_annotation is made up of a single byte
plus an unlimited number of uleb128 values. Each of these values
can double in width in the worst case. I received (personal) email
from one user who'd run into a case worse than the incorrect 1.34
limit.

Change-Id: I3b676e6d2b274aaa538ca61ce23945b3d49aff04
Optimize those StrictMath routines that are identical to Math routines.

We can just use the existing Math intinsics.

Bug: 7146208
Change-Id: I9e78d33cf65a5dcc5a7c0133e67bd9c3c1e43f23
using bootstrap trash icon instead of remove icon
Fixed sending of info strings.

Signed-off-by: JM <thatbox@ymail.com>
Merge pull request #1 from ThatBox/master

Fixed sending of info strings.
Add support for a level with no roles.
Signed-off-by: Ian Macalinao <ianmacalinao@gmail.com>
Partition the LCD library
Merge branch 'master' of github.com:WowFunHouse/Wow_TestBench
added three diagrams for parameter verification section
Nettoyage, merge de la fonction can_post avec have_access, ajout de contrôle en tout genre et corrections multiples
add euspcl_pcl_util.h for utility programs
Up-date
fix hash value have white space problem
fix dependency for DevMode with RequestFactory
Merge pull request #16 from a14n/fix-dependency-devmode-rf

fix dependency for DevMode with RequestFactory

This is temporary, waiting for GWT 2.5
Core: alanguage bugfix.
Merge remote-tracking branch 'origin/1.1.2' into 1.1.2
Text fix for our of stock notice.
Added missing tests

Added in some of the missing tests.
midi class
Gestion des auteurs pour la nouvelle base de donnée plus correction du merge concernant les tags.
Merge avec le début de la gestion des emprunts avec mise en page
9+ à la place de 8+
Ajout des fichier du module
Correctif recherche
[PIL - Ludotheque] Merge Fin

Intégration des dernières modifications
Enbaling configuraiton of encoding
refactored test to be more readable
automatic cleanup, organize imports and formatting
Merge remote-tracking branch 'secondsun/encoding_config'
[Add] AeroGear-OTP (1.0.0.M1.20121124)
Referencing RFC on README
added $apply for async model update
added comments, etc
Assign issues for users
Received issue
Merge branch 'master' of git://github.com/mykingla/pin-stories
合并xiao的代码
added blue-dream-linux vcs
coerce for select field
Allow an optional ServerAdmin to be specified to the vhost.

For some sites, this is an important detail. Particularly when using the
default Apache error pages.
can add and view guests
Create an user model
Added microposts model
Improving delete_comment
init tech-sharing-oop slides
Improve unit testing setup
Improve tests, a little re-architecture
Update licence application tests to use test helpers
Release 1.0.0

Breaking changes in Panopticon registration.
Adding mask of initrd USE flag on upkern.
Arquivos .js renomeados
Merge pull request #3 from sergiovilar/master

Arquivos .js renomeados
mad world
lose the minified files
Basic Widget Functional

Basic logic works.  Seeks by time/date and fetches show.  Default case
works as well.
New XML tags are added for default show
try 2 for tonkatrucks
First commit. KCAScenario done with the new XML Parser, suning an xsd.
Move KCANode in an internal class. Improvement of the constructor of
Paramters to use getFirstNode() instead of an iterator.
Add classpath file and project file.
small fixes and changes:

  - fixed the implementation of getFirstNode and getNode in XMLNode;
  - IMPORTANT: the changes imply that now the index in getNode
is 0-based.
  - fixed some project settings and the classpath.
Revert "Add interface ScenarioNode, Parameters in order to have a generic algorithm for the foreach loop."

This reverts commit 7194f0ad41eb4ddcb91b55b786fe105ed78cba89.
Add interface ScenarioNode, Parameters in order to have a generic
algorithm for the foreach loop.
Add interface ScenarioNode, Parameters in order to have a generic
algorithm for the foreach loop.
Merge branch 'working-alex' of https://github.com/andreiolaru-ro/AmIciTy-Mi.git into working-alex
Merge remote-tracking branch 'origin/working-Guillaume' into working-alex

Conflicts:
	.classpath
	.gitignore
	.project
	.settings/org.eclipse.jdt.core.prefs
	information/changelog.txt
	src/KCAAgent/Fact.java
	src/KCAAgent/KCAAgent.java
	src/KCAAgent/KnowledgeBase.java
	src/KCAAgent/Logix.java
	src/KCAAgent/Specialty.java
	src/agent/AbstractAgent.java
	src/agent/Measurable.java
	src/agent/Measure.java
	src/base/Environment.java
	src/base/Message.java
	src/graphics/AbstractGraphViewer.java
	src/graphics/ViewerFactory.java
	src/logging/Log.java
	src/scenario/DocNode.java
	src/scenario/Scenario.java
	test/seed
	test/test3r_save.xml
	test/testSmall2.xml
Merge with guillaume
Merge remote-tracking branch 'origin/working-Guillaume' into working-alex

Conflicts:
	src/agent/Location.java
	src/base/Environment.java
	src/graphics/ViewerFactory.java
Fix some merge problems with Guillaume' repository
Update abstractAgent
Merge branch 'working-alex' into working-Guillaume

Conflicts:
	src/logging/Log.java
modification of gitignore
finish implementation and of FEM algorithm proposed by Walter et al. 2010 and incorporated into simulation in cortante_mu_walter.m
removed ) following run_list items.
First draft of domain models complete, starting to play around with
views
Изменен запрос для получения точек в маршруте. Добавлен номер точки в маршруте и время посещения. Приделано к заполнению списка точек.
Merge remote-tracking branch 'origin/master'
Добавлено isGoldenStoreParticipant
tweaking data layer
key+thing_id should be unique
Added direct reader and updated tests.

USERGRID-753
Removed note about metrics not appearing on apptentive.com
PAUSE / RESTART AND CONTEXT-RENEWING ON ANDROID TESTED SUCCESSFULLY ON ANDROID
Removed Archive.zip & portfolio.php
HTML output works!  All files are generated in the current working folder
Clear all implemented
Database copied on every new install
Commiting permission changes.
Added some static text to go along with the image.
Merge branch 'master' of https://github.com/aruizca/nerderg-challenge

Conflicts:
	grails-app/views/image/image-view.gsp
adding has_preference_map_spec test cases
setBrush引数変更

Signed-off-by: Naoya Kikuchi <ashidome@gmail.com>
Merge branch 'master' of https://github.com/ashidome/Paint-BuiLder---.git
Fix Request Ric msg by count controlID and start controlId with 1.
update README with basic documentation information
add example2.html
add signalbar2.png
delete ll] file
Test existance of default CSS before reading it

If no CSS files are specified we attempt to load in the default
stylesheet, which defaults to "/stylesheets/email.css". Since this file
may or may not exist in every Rails app, its existance should be
verified before attempting to read it.

This dies silently if the file does not actually exist, but when running
mailer specs it clutters the output significantly as File continually
warns you about the nonexistance of email.css
printing interpolated potential
rc5 map
fix typo
do not upload simulation objects
Merge pull request #1 from ipa-fmw/master

rc5 map from malaga
the tutorial init
Merge branch 'master' of github.com:backbone-boilerplate/init
updates and added in module
Fixes #467
Merge branch 'unified-journal' of github.com:backlogs/redmine_backlogs into unified-journal
Fixes #650 date_string_with_milliseconds doesn't respect timezone
Directory clean pt2
useless control removed
This adds support for XHGui, a database driven GUI for XHProf

Added support for XHGui.

Need to set the following configuration options:
- entity_manager:  <name_of_entity_manager>
- enable_xhgui:    true

See https://github.com/preinheimer/xhprof for XHGui
Merge pull request #9 from baldurrensch/xhgui

This adds support for XHGui, a database driven GUI for XHProf
Added documentation for PR-9
Merge pull request #10 from baldurrensch/xhgui-doc

Added documentation for PR-9
Changed namespace of Doctrine Bundle as that was changed in Symfony 2.1
Added a sample size parameter

This is for production environments to specify how many of the requests should be profiled. Think of the sample size as "every sample_size-th request will be profiled". This works as a probability though.
Updated README for sample size

Added paragraph about specifying the sample size in the configuration
Merge pull request #11 from baldurrensch/symfony-2.1

Symfony 2.1 & Sample Size configuration parameter
The xhprof url is now in the response headers
Merge pull request #12 from adrienbrault/patch-1

The xhprof url is now in the response headers
Icon added. Toolbar link added. Profilling status displayed
Merge pull request #13 from robertdolca/master

Toolbar facelift
[Entity] Add XhprofDetail Entity
[config] Add request as a parameter of xhprof_listener
[RequestListener] Modify __contruct method
[Collector] Modify Collector to use the XhprofDetail Entity
Merge pull request #15 from jeremymarc/entity

Use XhprofDetail Entity in the Collector
[Entity] Update field type from text to blob for perfData, cookie, get and post
Merge pull request #18 from jeremymarc/master

[Entity] Update field type from text to blob for perfData, cookie, get and post
removed the id set and it currently is null, doctrine will generate and then I will assign it to ->runId
cleaned
merged
Removing the radiobuttons to change the current classification. This will be done solely through the classification file
Fixed a bug in the route. Also added view.
Incorporated keys_as_types function into an assertion in the SongDB class, to make sure that the appropriate type search term is entered for the appropriate key
making sure no nullpointers will occur
deploy to linode with unicorn, gem updates
Back to firefox. And add csv script.
Added 46x46 weather widget
Added 46x46 Test widget
Improved widget layout spacing
sortable functional.  need to implement ajax.
Decrease container width.
Fixing /lib/emaildirect/database.rb.
Adding view layouts and task classes. Updated composer file.
exhibition index page
added future exhibitions to exhibitions index page
Newly named apps-classic-theme. Allows an app to be displayed with or
without borders. View and Edit Modes simplified.
Laid out plans for Order Studier.

Signed-off-by: William Raiford <bill.mybiz@gmail.com>
[darwin] regenerated from binaryage/totalfinder-web@1bdbb86
https://github.com/binaryage/totalfinder-web/compare/4b0d4d543885...1bdbb8651524
Handle empty yaml files.

Sometimes a yaml file could be empty. This change allows settings logic to handle that rather than throw an error. 
Merge pull request #40 from craigmarksmith/master

Handle empty yaml files.
LH#75, 77, 78, 80
Link to some blokvm implementations
Optimized map icons for retina display.
added test map
Merge branch 'master' of github.com:bobsomers/remote-game-jam
Re written in half as much ruby
route titles weren't being added properly
corrected font display of cite element
Tracking
Added more to Query builder
Query builder should be done
Adding files
adding messages after make tasks
refactored list to utilize layouts, composite views, and updated templates
setup stylesheets and wrapped all views in a container
update config factory to store proxy namespace in production config
Creation for gAMA chunks
avoid starting and stopping he vm so much
avoid starting and stopping he vm so much
[maven-release-plugin] prepare release vmrun-java-wrapper-0.0.1
UI & JS: Banner position tweak
added ck-laucher to the xinit
Renaming png
Added a Markdown documentation page for pynmovie.
Added the userscript feature to pynmovie.
Predator statespace was reversed
Renames
EnvironmentNormal Value Iteration works
Added location
Added policyIteration
2012-10-16 12:52:36
Stupid lockfile
Point Distributions module to JuliaStats URL
Bump to 0.0.1. Fixes a bus related to a recent change in
Intrinsics (box and @enum).
Merge pull request #5 from tshort/master

DataFrames.jl  0.0.1
Merge pull request #4 from johnmyleswhite/master

Redirect Distributions module
Distributions: add Options to requires for v0.0.0 and v0.0.1
redirect Winston
Merge pull request #7 from nolta/pr-redirect-winston

redirect Winston
redirect ICU, UTF16
merge Plot into Winston
Merge pull request #8 from nolta/pr-icu-utf16

redirect ICU, UTF16
Merge pull request #9 from nolta/pr-merge-plot-winston

merge Plot into Winston
ASL 2.0
a working example post info to a page if the temp is below 77F
Merge pull request #1635 from bryan-m-hughes/timob-7946

Timob 7946 Updated XML implementation.
[TIMOB-5698] Fixed typo.
[TIMOB-8438] Moved deployType in the require.config so that it was available from Ti.App.
Lab
Stable readers writers
*leaves functionality extracted
Simple readers writers.
Writers turning into readers in simple promela version
Simple promela safe readers->writers, writers->readers
Removed unneeded reading variable from promela solution
Unneeded writing flag removed from promela solution
Readers Writers with semaphores
Unneeded `readers` removed from readersWriters
writing split into in_writing and waiting_to_write
waiting_to_read added to semaphores model
Locking on two semaphores (exclusive/shared)

exclusive for writer or for all readers
shared for reader
Readers and Writers on separate semaphores
Writers turning into readers in semaphore version
Readers Writers with semaphores
Style fix
Added implementation of object adapter pattern

Change-Id: Ie0699ba46879472cf865acd1f11efa571949f894
add generator for generic, cookie and reply struct
Update submit.php

Moved if into the if-elseif-elseif-else set of statements so we don't have the rest of the code running after it's already figured out that the app is invalid.
App_GlobalResources deleted
Resourses changed from compiled to none.
Added parseSentence function.

Returns ambiguity classes for each word.
Fix account configuration value saving, add ServiceAccountModel

Previously, the configuration values were not synced to the database
correctly.  This patch ensures that not only can existing values
be updated, but new values can be written; and it uses a per-type
conversion function to ensure that values are read back correctly.
It also ensures that setting the display name of the account is the
last thing done prior to sync(), avoiding overwrite due to the
magic "name" configuration value.

The unit test is updated to ensure that no regressions can occur.

Finally, a ServiceAccountModel type is added, to allow per-service
account information to be displayed in a list view.
Minor maximum likelihood corrections
skróciłem losowanie
CJ - Moved database operations out of GridView file and into Database file.
CJ - Now that we're using one class with partials, renaming class to be more generic.
ecl-reports.lisp: reverse order of arguments to compiler-diff according to the new version of that function.
Merge branch 'dev'
Cleanup of assorted things

- Rename common file to staging_plugin

- Refactor Rails database support

- Add default dir for running secure ops

Change-Id: I5de84baf791144ce5d2546c69949df0864d67267
Increment version to v1.0.23: support fetch format and effects parameters
Merge branch 'master' of github.com:cmarini/NSE-Train-Control
Moved ctc and simulator packages to respective directories
Implements comments backend and basic frontend (read only)
Merge branch 'master' of https://github.com/cmdalbem/redetrabalhosinf
added ruby version manager to ensure working config
links on column headings
got sort working
column highlighting working as well
sort by rating
set ids correctly
session remembering
Adding featured project image and logic. Removing old styles. Vertically flexible project data.
Fixing navigation images. Removing trail styles.
Removed body top border.
Removed the last string switch, hopefully should be all  the java 7 stuff
Added support for disconnecting controllers and connecting controllers in the middle of a query
More java 6 compatability changes
Merge pull request #7 from WesleyLuk90/master

Removed unused files
forum suggestions for zune and file not found err

MusicPlayer: [pkayatt] Added #if ZUNE checks on the stop() method per
pkayatt suggestions (Forum #13744)
CCSpriteFrameCache: [c.a.] Changed check on "dict" to be "metadataDict"
to stop an erroneous file not found error.
sheriff foreclosure load from sheet
sheriff foreclosure import from worksheet
reintroduced address parsing
added write file to fetch from amazon, PARKWAY to street_type in address_helpers
error handling for strings longer than 255 returned by sheriff
Merge branch 'development' of github.com:codeforamerica/openblight into development
updated readme now that prod db seeding issues have been fixed in master
Tweak perf example in The Basics
Starting out, pitching an idea
Adding ideas and needs
WhoKnows initiated
WhoKnows idea growing
Added README
Boilerplate
Parsing JSON, calling token generator
Stub for scaling; NLTK cleaning
Almost completed cleaning
Completed cleaning
Added shelving
Add DbGeneration Stuff
Create Readme.md, add project notes + license.
CORE: fix bug in getByMagic when parameter is a cid which is not in use. was returning [None] instead of [] and also :
- checkstyle on Parser class
- adjust log messages' levels in the SFTPytail plugin
Added more unit tests to test model relationships.
Added submit and enter callbacks for widget.
The callback is now passing back a model instance.
Removed role_id as requirment. Added tracker id as widget option.
Removed private declaration.
Attempting to pull tracker id from params.
Corrected type-o
Moved after init call.
Made callback hook private.
Removing callback inits for now.
Image paths needed to be public.
Added twitter bootstrap and simple form to the engine. All widgets should be rendered using these ui assets.
Started to reface widget with twitter bootstrap.
Signed-off-by: cparratto <chris.parrratto@pnmac.com>
on enregistre pas les BDD
maj du README
remount with noatime and nodiratime
Removed Debug folder from git
Bunny before key schedule
Implemented round key mechanism
implemented Artur's method of getting Android serial number
several updates

404,500 errors handled
queries use different users depending on privileges needed
Backed out revision b1ae19f91006
trying smoother animation using less CPU (ie. slower)
Added some recursion
event spots functionality done
event spots task done
Made nice random-color fireworks.

Nice tech demo, but not my ultimate result in mind.
Create testutils with skip decorators.

This patch creates openstack.common.testutils which includes some
decorators used to conditionally skip tests.  This is needed for the
rpc unit tests.

Change-Id: Ic6bc8d58f7dfcd9eb3acd2749c475b9d760b9578
Merge "Create testutils with skip decorators."
Replace datetime.utcnow with timeutils.utcnow

Fixes bug #1008064

Replaced datetime.utcnow usage with timeutils.utcnow

Change-Id: I8bfdc1abefc3891497554335a3078d4028ef8ac9
Use an attributes class to identify images
Estilização da listagem de parcerias na page more
Fix buildout reference to collective.js.datatables repository
show comment count of replay
LPS-26094 Apply to liferay-plugins
better error message for fallback of cargo-handler.
msm: kgsl: Invalidate base pointers when tlb is flushed

Invalidate the base pointer even when tlb is flushed. For
gpummu the base pointers are invalidated even after just
a tlb flush, with IOMMU do the same.

Signed-off-by: Shubhraprakash Das <sadas@codeaurora.org>
(cherry picked from commit 967c91794d71107053471f33b903176a3522431d)

Conflicts:

	drivers/gpu/msm/adreno.c

Change-Id: Ic2e6d9b323d8aadabfe73b57d82cbe4500d666fe
Signed-off-by: Sridhar Gujje <sgujje@codeaurora.org>
Added target option documentation to readme
Removed .patch file
BATCH-1860 - Fix tests (Derby queries now involve sub-query for ordering) and refactor superclass test to reflect that table alias is now present by default (changed as all but one subclass required the table alias)
Merge branch 'BATCH-1860' of https://github.com/davidthexton/spring-batch into BATCH-1860
Seperated the Rooms
Changing some borders in the monitor section.
Add chanko units finder
added multi-interchange markers
dont use raise in #stream
rename repository references
Merge branch 'master' of github.com:despo/cyprus-street-names
update gemspec link
small commit 3
Merge branch 'master' of https://github.com/desposi1/battle-challenge
Deleting bin
adding daemon dependency
checking debconf value before running assets:precompile
Again Gonna Revert
forgot to save ball class file
Merge pull request #647 from diegosarmentero/master

fix small bug
Merge pull request #648 from diegosarmentero/master

improves for system imports
PYTHONPATH is comming
Merge pull request #649 from diegosarmentero/master

Improves in Completion
Merge pull request #650 from diegosarmentero/master

fixing some completion bugs
Merge pull request #651 from diegosarmentero/master

fixing some completion bugs
Adding PYTHONPATH feature to ninja-ide projects execution!
Fixing inapropiate language ...
Merge pull request #653 from edvm/master

adding PYTHONPATH support at Ninja IDE projects execution
Merge pull request #654 from diegosarmentero/master

resolving chained calls to own objects
analyzing returns and little refactor and improves
Fix a bug with Mirror on windows (\ and / mix leads to crazy behaviour)
Merge pull request #8 from eprochasson/master

Fix a bug with Mirror and windows
Thanks @eprochasson!
Bumped version numbers for 1.3.0Beta
Added Win8/2012 Check in WinVerEx.nsh (no need to alter 3rd party component (NSIS))
Update Swedish and Italian Language string.
Fixed dutch language file
Fix typo. Thx HomeY!
Fix related Mantis 4009.
Initial Titan skin commit.
Merge remote-tracking branch 'remotes/origin/EXP-4063-Update_revision_numbers_for_1.3.0Beta'
Moved fonts to correct folder and also removed redundant font
Updated fonts to correct names for Titan skin
Merge branch 'BUG_4086_Installer_Fonts'
string formatter
fix
test fix
Merge pull request #336 from YuliaNikonova/master

StringFormatterN
calculator fix
Merge pull request #85 from FrolovNikolay/master

Task 01. Calculator
Add pyramid_socketio's gunicorn worker to django_socketio.
Refactor tax_codes and tax_code_groups to check for exceptions before opening file for writing.
Merge branch 'master' of github.com:drewtempelmeyer/tax_cloud
fixed resolution.
Fixed the search functionality.
[FIX] Links

Not all links worked properly.
Changed the custom function to use the backwards compatible version of resolv.
Finished basic functionality of plot, mark, save and clear
* Fixed non-standard port, try 2
Forgot to update Changelog
Components scaffold removed
Components scaffold regenerated in english, views traslated to spanish and not null restrictions added to migration
Fix identation
More work on formula parsing. Add a shared class for shared code.
soru/cevap linki eklendi
profil gösterme hatası giderildi.
Profil yerine Merhaba yazdım, daha insancıl :)
yetki korumalı ve session korumalı generic view
Merge pull request #6 from yigitsadic/master

Bazı iyileştirilmeler yapıldı.
Drivers: Add A1026 voice processing driver
no summary available
Add autoload comment for compatibility with Emacs package manager(s)
FWIW, I agree with both of you.
More additions
added a few more docs
Add xPDOObjectTest::testValidate() unit test
Fix country accents for French lexicon file (@anso)
French translation
Take care of modUserGroupMember rank upon creation
Make sure the package provider ID is passed while searching for a package from MODx.panel.PackageBrowserHome
Make sure we are not passing the whole textfield as search query while the search field is empty (maybe better to replace with : '' instead of tf.originalValue)
Should fix bug 6522
Add failonerror="false" to Phing build cleanup tasks
[#7498] Fix Media Source error reporting for file uploads
[#8423] Add flock-independent file locking to xPDOCacheManager::writeFile()
Merge remote-tracking branch 'xpdo/develop' into develop

* xpdo/develop:
  [#8423] Add flock-independent file locking to xPDOCacheManager::writeFile()
  Add xPDOObjectTest::testValidate() unit test
[#8420] Provide flock-independent file locking to avoid cache corruption

In some multi-threaded server environments, flock cannot be relied on for exclusive file locks. This provides an option within xPDO called xPDO::OPT_USE_FLOCK or 'use_flock' (assumed to be true if not set) which can be set to false to use an alternative file locking approach which should work in any multi-threaded environment

Merge remote-tracking branch 'xpdo/develop' into release-2.2

* xpdo/develop:
  [#8423] Add flock-independent file locking to xPDOCacheManager::writeFile()
  Add xPDOObjectTest::testValidate() unit test
Merge branch 'release-2.2' into develop

* release-2.2:
  [#8423] Add flock-independent file locking to xPDOCacheManager::writeFile()
  [#7498] Fix Media Source error reporting for file uploads
  Add failonerror="false" to Phing build cleanup tasks
  Add xPDOObjectTest::testValidate() unit test

Conflicts:
	core/docs/changelog.txt
updated logos #8125
Update French lexicon topics for release-2.2

Merge branch 'fr-release-2.2' of https://github.com/rtripault/revolution into rtripault-fr-release-2.2
Merge remote-tracking branch 'rtripault/fix-usergroup-rank' into bug-7630
[#7630] Add changelog entry
[#7630] Save modUserGroupMember rank upon creation

Merge branch 'bug-7630' into release-2.2

* bug-7630:
  [#7630] Add changelog entry
  Take care of modUserGroupMember rank upon creation
Merge remote-tracking branch 'rtripault/fix-6522' into bug-6522
[#6522] Update changelog
find_most_sim_cluster in similarity module redecalred
The changes are only saved now if the content actually changed.
scalatools, sonatype, who knows?
Edited h1.
Added class current to li.
added fields to enter search queries for donations
donations: new big method to do everything
Merge branch 'donation_search_view'
Arrumando link do ícone de zoom
MYB-1573: Store CalCentral's topnav background image reference in our own skin.
Merge branch 'dev' of github.com:ets-berkeley-edu/3akai-ux into dev
Try to join all setups under one configuration.
Merge text.
It appears that 'X should be 'x.
Patching scrolllock.
Merged ispell/aspell setup.
Merged ...
changed to the group version
Add bson as a requirement and don't try to use it via mongodb package
remove double require 'thread'
add EventMachine.defers_finished?
defers_finished?: don't return false if there never was a deferred action
Merge pull request #316 from paddor/master

Add EventMachine.defers_finished?
addthis track off
small fix checkout page
case object snippets

Signed-off-by: fedesilva <fede.silva@gmail.com>
delete cruft

Signed-off-by: fedesilva <fede.silva@gmail.com>
supertab is back!

Signed-off-by: fedesilva <fede.silva@gmail.com>
* Bug fix: will now check to see if the plugin has been updated and update settings as required to avoid problems such as "Call to a member function date() on a non-object..."
* Cosmetic fix: Spaces after input labels
* Bug fix: Check to see if the old widget is being used, if so alert the user
* Remove last minute debug statements
* Rev version
* Optional idea to update widget...doesn't seem to be working though.
* Bug fix: Widget settings move over properly from 2.4.3 now
* Removed debugs
* 3.0.1 commit
Fix for #1348: Install git-credential-winstore.exe the same way as PuTTY
3rd party assemblies recompiled to .NET 4 Client Profile. Installer required only Client Profile
Revert "git-credential-winstore integrated to installer to properly handle HTTP authentication. Closes #85"

This reverts commit 798ca397c546acbe1053ef6c49338ec4049e834c.

Conflicts:
	Setup/Product.wxs
	Setup/UI/RequiredSoftwareDlg.wxs
credential.helper value fixed
Helpers added for Linux and MacOS
Support translation for new strings
Merge branch 'feature1348'. Closes #1348
CommitInfo displaying under Linux fixed. Closes #1347
Several code analyzer warnings fixed
Show more context lines above change when navigating to prev/next change
Revert changes from 92252b75b5d584f08c93f8ba93ddb3cae6a000fe.

They cause System.ArgumentException
Decreased number of generated ContextMenu for DashboardItem
Several code analyzer warnings fixed again. Closes #1359
Wait for diff reload before process next click event to prevent from working on non up to date diff.
Remove file mode warnings on windows
Updated version for 3rd party assemblies
Updated version for 3rd party assemblies
Fix for issue #1353: Reading StandardOutput and StandardError synchronous could result in a deadlock

This msdn article describes the problem:
http://msdn.microsoft.com/en-us/library/system.diagnostics.processstartinfo.redirectstandarderror.aspx

"A deadlock condition results if the parent process calls p.StandardOutput.ReadToEnd followed by p.StandardError.ReadToEnd and the child process writes enough text to fill its error stream. The parent process would wait indefinitely for the child process to close its StandardOutput stream. The child process would wait indefinitely for the parent to read from the full StandardError stream."
Partly fixes issue #1320: Opening .gitext files launches installer

TODO: Restore icon
Updated to WiX 3.6 and msysgit 1.8.0
Change the admin email
Reword the help text on the Post edit/create page to more accurately explain what happens
TypeKeywordValidator: simplify logic

We are now much less verbose on reporting, but still accurate enough, and the
code is much more readable.
ValidationReport: start giving fail() the boot...

... By just changing the logic of .isSuccess().

All tests still pass, save for _the_ one which only fails on full runs...
ValidationReport: get rid of status, and of ValidationStatus as a result

The test on messages being empty is now reliable, and error() has been ditched
already. It means ValidationStatus has no reason to existe anymore.

Give it the boot for good.
ValidationReport: get rid of fail()

It, too, has become obsolete.
ValidationReport: give .fail() the boot
first commit, only picture
bug fix with video
Video background
Video background code
Improvements in video playback. Alternate messages, and their persistence.
Smoother video start
Nicer layout + better format of msg date.
typewriter effect
better small icon
Better video file, try catch blocks.
Fixed format, added a couple tests.
Remove extra comma in json.
seals, whisper specific buff name

closes #1
some configuration issues

Signed-off-by: Floyd Pink <imbleedingme@googlemail.com>
Version bump to 0.1.3
v0.1.3
Regenerate gemspec for version 0.1.3
Don't release the  extAudioRecorder.
pull in (probably incorrect) yml and com files
patched up the horrible horrible ui issues where things would not show up correctly, time to push and update my blob (yay)
added bootstrap, compass, gems, setup
Removed the loading of the google api key as we are no longer using
google maps.
Merge branch 'develop'
done nouns M
Time introduction
Server variables and variable scope
References
extends hack
completely rewritten
completely rewritten
Merge pull request #1 from slacknux/master

Code completely rewritten
updating rsyslog submodule
updating rsyslog, user priv problem
Auto Updating rsyslog submodule
Auto Updating graphite submodule
Auto Updating nova submodule
Merge pull request #178 from jcannava/sprint

rsyslog updates
Merge pull request #179 from galstrom21/sprint

Updating role(allinone) to include collectd and graphite roles
Committing initial app structure with lots of stubs to build out
add canContinueCall
update gitignore
update to gitignore
Switched to using CATiledLayer
vo_wl: Add ontop call
vo_wl: Implement VOCTRL_REDRAW_FRAME and fix bugs

Bugs:
    * use the image size for window size -> fixes frame_listener bug
    * add break statements to the switch statement in control
przyslowie japonskie
Merge pull request #107 from agaj175/p4

przyslowie japonskie
Fix so that test isn't so sensitive to additional logging
Homework weeks 4 and 5
adding in the new ndk
Removed old information, updated changelog.
3D Model Work

Changed the ModelObject class and added a World3D class for model
testing.
Update tutorials/_posts/2011-07-18-attachment-type-in-action.textile