labofsahil/github-event-dataset-2012 huggingface dataset:
merge
Merge branch 'master' into Rob_Working

Conflicts:
	src/client/states/gamePlayState.cpp
add more animations
minimap closer to being finished.
Merge branch 'master' into Rob_Working

Conflicts:
	src/client/states/gamePlayState.cpp
added two more sprite sheets
Merge branch 'master' into Rob_Working
Merge branch 'master' into Rob_Working

Conflicts:
	src/client/states/gamePlayState.cpp
	src/client/states/gamePlayState.h
	src/client/states/mainMenuState.cpp
server can send add enemy message now.
Merge branch 'master' into Rob_Working

Conflicts:
	src/client/states/gamePlayState.h
merge
changed particle durations and added functionality to all spells, press 6(Fireball), 7(lightning), 8(Ice), 9(Heal)
Merge branch 'master' into Aaron_Working
Fixed health/mana rendering and finished up source rects for spells.
Merge branch 'master' of https://github.com/Jeaye/DarkRedemption
sdgrgh

Signed-off-by: Johnmalc <cincenko@seznam.cz>
properly extend the router
Merge branch 'master' of github.com:JosephMoniz/warpgate
made a few updates
adding irc stuff, w00t w00t
fix style students
mini fix
[view] make admin navbar menu with sub menus for disposals and presets
fix conflict
Merge branch 'master' of git://github.com/absolu7/GAKUEngine
Merge branch 'master' of git://github.com/absolu7/GAKUEngine
fix ja.yml
mini fix
Merge branch 'master' of git://github.com/tapalilov/GAKUEngine
fix conflict and ja.yml
Merge branch 'master' of https://github.com/snowsunny/GAKUEngine

Conflicts:
	config/locales/ja.yml
fix syllabuses.js.coffee
WIP test
Merge branch 'master' of https://github.com/snowsunny/GAKUEngine
fix grading
[AJAX CRUD] controller, view, ajaxes, locale
[view] group types in global menu, add commute method types, locales
Merge branch 'master' of https://github.com/tapalilov/GAKUEngine
Merge branch 'master' of git://github.com/martakostova/GAKUEngine
Merge branch 'master' of git://github.com/tapalilov/GAKUEngine

Conflicts:
	config/locales/ja.yml
fixed locale branching miss
fixing translatins in ja first. en will be broken
removed binary and added hex conversion, this now REALLY works. brb, slitting my wrists
display surface : )

I was able to display the surface color
added the rectangle!!!

changed the color of the rectangle and the side bar color as well
trying to add the line but having problems

I think all the coding is implimented but the line does not appear on
the screen... : (
Trying to draw the circle.

stuck : (
Camera movement with LEFT MOUSE BUTTON.
Merge branch 'dev' of github.com:Kazuo256/mac0420-ep1 into dev
Adjusting space dimensions [1].
Adjusting space dimendions [2] - FINISHED FOR NOW.
3 err to 1
libary fix
Created new directory and project skeleton, added new MakeFile, seperated main, headers, and lib
Modify _config.yml
Basic settings done
Add submodule: myoctheme. And add it as the style
Do not use Google Font API
Add posts for testing
Update submodule: myoctheme. Add about
Update submodule: myoctheme. Update related files in sass
Update submodule: myoctheme, and update related files
Modify title
Update submodule: myoctheme & update related files
New style done, update submodule: myoctheme
Update posts
Clear route-based redirection helper method name
work in progress 0.0.1
Replaced tabulation on spaces
Add setTimeout to prevent browser UI freezing
Made global refactoring to provide flexible API
Initial stage of Context and Multiplexer arch
Finish multiplexer
Finished refactoring. Added API calls
Refactore whole plugin and add basic API support

Refactored the plugin. Now, imageShadow() returns the object,
which contains the API functions: init, isActive and destroy.
Also, separate context is stored for every img.
It is easy now, to add another API calls.
Fixed Engine and beautified interface

Broke saving expanded items. Calling expanding awakeOnNib and init
doesn't allow the actual expanding. Out of ideas.
Weird unselected commits

Thanks for the third time, GitHub for mac.
ribbon
js
Merge branch 'master' of github.com:LeoAJ/Twitter-Search
modify github url
* Add ability to import groups via CSV.
* Mantis 0000440: Multiple translation units and messages
* Update locales.
* Various bugfixes.
Update locales.
Update changelogs
- :validatable is removed from User model; 
+ signing in by email OR login (username attr_accessor is used); 
+ before_save validation for login and email
* develop database name
* translate Login in russian
* authentication by :username (email or login)
+ Signing in by login or email
+ add index for :login field
* :email field becomes unreuired; 
* :email field's index becomes ununique
* schema
* error fixed
Choose a random port for mongo to listen on in CI
Merge branch 'master' into ijod
Introduce a bit of delay for hard paging
Localization updates

Change-Id: Ie88ddee0c80a127377747cc117c0fbad83ef453e
Merge "Localization updates" into public/10.0
Merged bugfix to InventoryTransaction from machinacraft4 into master
branch
removed 1 line of dead code
merging
merging
merging
merging, strings transleted, timer bug fixed
Changed the link to the grid system.
Bug 8628 - Refactor some code from opac-sign.pl into Koha::Signs::GetStreamsAttachedToSignWithRecords
Bug 8628 - Make inclusion of MARC data in Koha::Signs::GetStreamsAttachedToSignWithRecords optional
Bug 8628 - Add detail page for signs in the intranet, showing records
Bug 8628 - Fix a typo on main intranet page
photoshop tuto 01 - moon

zip file containing necessary ressources to realize this tutorial
YUICompressor installed and configured
BugFix: YUICompressor path modified
AcmeDemoBundle removed, Bootstrap Twitter installed.

The DefaultController has been renamed to FrontendController.
Adds man page for gravastre
Adds a tip about manpage
Reformat the date/title display, add a waiting event.
Actually filter out sales calls this time to avoid skewing of data.

* Add folds to csvtools.py
adaptation a chaque redimensionnement de la bannière
Tweak arguments parsing

...to allow show info about mc options regardless of the fact that
configuration directories cannot be created.

Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
Merge pull request #119 from clarkcyt/mine

fix a runtime bug of dawu
fix a bug of log
Merge branch 'master' of https://github.com/Moligaloo/QSanguosha
remove the useless code of ai hongyuan
fix to ice's effectiveness
fixed a bug with water pokemon
[TASK] Add CSS class to Post title and content
ClassPath Scanner is should not be read anymore :-)
another way to commit
another way to commit
Ingen forandring. Jobbet på Feil
Get somewhat ready for npm.
Node implementation.
Move QUnit tests.
Fixes to Node implementation.
Add mocha tests.
Add Testling stuff.
Show the total at the end of the import
Enable bulk commands for sessions again
An importer for sessions

Closes #12
hello!!
hello!!
hello!!
hello!!
hello!!
hello!!
hello!!
backbone added
configuring symfony
configuring symfony
configuring symfony
configuring symfony
configuring .gitignore
configuring .gitignore
configuring .gitignore
configuring .gitignore
ignore
ignore
Configured pinporn
configuring .gitignore
patterns init return all, not just really initialised

this is to be compatible with jquery init
fix logger for pattern init
parser checks also $el for config
#2 Drop jquery collapse + tweaks
fixed redirect method
Changed usage: ./c USBDRIVE
Read Me Updates

Read Me Updates, Assembly Info Updates.
sysinfo: updated webui
Updated documentation
Display station IPs on Wireless page
Added Build number to version.
packet movement
created project

herp derp this is good cuz I started it finally.
Added in some preliminary code

added in a player class that has yet to do anything
added animation class that has yet to do anything

ProjectFenixDown.cs:
added a HandleInput function that gets the state of the keyboard and gamepad and put it in the update loop


to do: pass the keyboardstate and gamepadestate to the player class to have it move.
Added functionality to player class

ProjectFenixDown.cs gets player input via HandleInput function
Update master function passes the input to Player.cs which handles the input InputUpdate function

ProjectFenixDown.cs clamps the player character via the playerClamp function

Signed-off-by: unknown <Korea@Hydralisk.(none)>
Added functionality to player class

ProjectFenixDown.cs gets player input via HandleInput function
Update master function passes the input to Player.cs which handles the input InputUpdate function

ProjectFenixDown.cs clamps the player character via the playerClamp function

Signed-off-by: unknown <Korea@Hydralisk.(none)>
holy shit you can make levels

Added the tile.cs
Added SampleLevel.cs

no collisions, but it works!

Signed-off-by: Jay Lee <RamenNoodles452@gmail.com>
Created the levelbuilder.cs class

moved the level building code from samplelevel.cs to levelbuilder.cs

Signed-off-by: Jay Lee <RamenNoodles452@gmail.com>
COLLISIONS WORK!!! HOLY SHIT!!!!!!!

added RectangleExtensions.cs for new stuff to help with rectangle collision.
added collision handling for the player in Player.CS

Signed-off-by: Jay Lee <RamenNoodles452@gmail.com>
A few minor edits to the player bounding box

commented out clamping

Attemping to apply gravity

Signed-off-by: Jay Lee <RamenNoodles452@gmail.com>
added MovesList.cs InputManager.cs Move.cs Direction.cs

None of this is integrated into the previous code yet.

Next Update will be integrating the code

Signed-off-by: Jay Lee <RamenNoodles452@gmail.com>
Crammed my shit into Jay's garbage

Now it's working


Signed-off-by: Justin Timmons <jmtimmons@charter.net>
Made changes to TheShredder and Projectile classes
	Added movement capabilities for enemies
	Added automatic enemy firing upon position
	Limited number of projectiles on screen to 20

Signed-off-by: Justin Timmons <jmtimmons@charter.net>
Gave enemy class ability to stop at edge of tile. Patrolling coming soon
	Changed tile positions to class variables in order to be accessible to subclasses
	Added collision detection to TheShredder class
	Changed enemy starting location to a platform


Signed-off-by: Justin Timmons <jmtimmons@charter.net>
Small changes to each class
	Cleaned up initialization and update handling
		Updates are now mostly handled through the Character superclass
	Fixed collision problem with enemy class, patrolling now working within a one-block radius
		Need to fix collision system still
	Added UpdatePhysics2 class while testing different methods of movement, scrapped most, can be ignored for now

Signed-off-by: Justin Timmons <jmtimmons@charter.net>
my current garbage before I combine with Justin

to be done: redo movemeny system + colision system
Add description of pre-commit
Fixed SetLookAt in the Resize function
Adicionado pacote util
SCEDC catalogs SCSN and SCEC formats 201209201600
SCEDC catalogs SCSN_format 08.20.12
Add bitbake recipe for daconi skin jules black hd
Add warning about InspIRCd 2.1 being obsolete.
Initial Commit
Commit #1 : GlView setUp, tiling plane drawing done
Feature : Tiling done
Adding files
Merge branch 'master' of github.com:Sagarhebbale/GLStubs
Revert "Initial commit"

This reverts commit 1d7a84008ed2be93a06f0b884f925e7bcbeeb9c3.
Changes spring source layout.
Merge pull request #51 from Shandem/4.8.0

4.8.0
Merge pull request #52 from Shandem/4.8.0

missing file
Update Documentation/Reference/Mvc/index.md

Change partial views title to h2
Xpath slash direction fixed
adding more sections to MVC
Merge remote-tracking branch 'umbraco4docs/4.8.0' into 4.8.0
Added docs for Child Actions
Added custom routes docs
gre
Merge remote-tracking branch 'origin'
base64
0.8.6
- that is not supposed to be there :D
some modifications
Merge branch 'master' of https://github.com/Sillypig/yinnuoleike.git
Removed unused scrips and added an Ant build script.
Fix test for 0.4.12
Customizing login for BrasPay
Den Code fuer 2 an Scrollabel angefuegt, CollisionTester geloescht
saves data per port. Checks if cold-start is already running.
derp
extra derp whois is already used as a command
Change name of project and get it working
Using blammo for logging
Upgrade to mocha 1.5.0
Better iOS detection
Added test queue, this fixes #1
Removing junk files
Technically working. Omitting Rfid provider for now until it's working with the web.
Commentaries added on almost everything I changed
End of the debugging of the filters
JSONP, yes!
Add e2fsprogs spk
Added methods for querying users and items
better ideas while sleeping
fix for ObjectSerializerTest because of assumed constructor order

I don't know if it's just my JVM (7u9), but
ObjectSerializerTest.testCustomClassLoader() fails because I don't get
the constructors in the assumed order.  This fixes search the list of
constructors for the required one and calls that instead.
Don't run startFrame and endFrame while playing a video for now, they make it choppy.  Also black out screen when playing videos.
Oops, copy Growl when archiving
Growl much more sense
Bumped version, updated changelog
[CONSOLE] Make separate timers for holding scroll and menu/exit button delay.

Fixes issues with exit/menu button combo not working on GC controllers occasionally
Fix build on #ifndef _WIN32.
removed useless exports
added member counter field
Visits notification, bug fix en new store servlet.
Merge branch 'master' of https://github.com/Throy/freezing-ninja
Caso de uso crear sitio (Incompleto)
.tex file aswell
configure: fix args->argv
More of the interface created... much of the actual content still
missing.
defaut rake task: tests
build script to create universal library
add version number access
build universal library
building minimal and full lestrade
Merge branch 'gwdp-master'

Conflicts:
	Lestrade.xcodeproj/project.pbxproj
fix merge issues
Deleted extra image
Add new design to the list view.
The location service now listens to the database
DatabaseHandler is now singleton
Altered XMLHttpRequest.prototype.send_s(). Altered Simple.AJAXHandler.CallIfExists.
investigator search now loads investigator directly if only one found
investigator search now loads investigator directly if only one found
investigator search now loads investigator directly if only one found
Merge remote-tracking branch 'origin/master' into staging
AudioParser.cpp: cosmetics
installer: update script for the change in 9a7df20d30968f7c517275ce841886a3a703a749
update Simplified Chinese translation [betaking]
Use _T() macro in TRACE and CheckAndLog calls.
change wording on the original post date alter.
New post about dynamic forms with json query, and change older posts' breakWords.
korrektur Playground
Added a class to represent a bitfield, added an extra type of range.
Zähler in den IntReader eingebaut für den Mergesort.
Implemented but not tested write method of the configuration.
added NeroServer and updated
Flags - correct checking for c or S being set
Update npm package #

Signed-off-by: WarheadsSE <max@warheads.net>
Remove fork mode.
removed unneccessary "this." prefixes
fix spacing issues
add chocolatey.org repo info
merged in rest/json fixes. reformatted html.
added missing implements
Merge branch 'master' of github.com:WoltNet/WoltNet-Wiki
Removed some stuffs that took out too many space. That's kinda nice for screenshots, but not quite useful
changed time_rand method, fixes one reservation generation validation fail
Merge branch 'development' of github.com:YaleSTC/reservations into development
Changed all public references from 'objects' to 'items'
removed an unecessary comment
Fix potential problem in awsetbg loop
Settled on a color for the actionbar.

Revision name changed, more appropriate.
Lots more stuff!
Handle default language in Splashform.
buggy commit: i want to group admin controllers to subdirectory. problem whith ruting 'localhost:3000/admin/' to admin/index
Require closer zoom to search for stations, previous setting was way too wide causing performance problems (+ we very likely didn't get all the results from the area). Also display feedback if zoomed too far out.
Updated dependencies for doc generation support
Add documentation generation
Fixed IntBoard getAdj to haev a param:
Changed from Twitter bootstrap to 1160 grid, many ui changes
Correction récapitulatif volontaire
Fix my class name to meet KeyRe's flavor
Set autocomplete threshold to 1
mwb change for image
changes to the way that the 3dr converts models. should be a touch more reliable.
Creacion de archivo Json para promociones padre
Merge branch 'master' of https://github.com/admingex/tienda0mxdb
Remove the unneeded forward declaration.
initialize values - is it that hard? :-)
initialize
usb fixes
sync htc.diff file
add retarded (?) audio patch
tegra cpu patches
add cpuplug.lib blob -- oh FARK you HTC!
fix usual compiler breakage :-)
Fix header wrapping in FF
Export links have white text. Explicit min-height for Firefox
Merge pull request #81 from WizardOfOgz/has-lists

Screenshot fixes
fixing divs and adding google translate plug-in
Done in 30 mins
blog rush done
LOW: Fixed Null pointer exception when no template has been selected to
create the TOC
IMPORTANT: Fixed docked inspector panel disappearing.
Убита глобальная переменная $db. Исключения: модуль форума и несколько специфичных мест (вроде файла инициализации и там, где нужно оставить обратную совместимость).
Created pyticalcs.c
Changes to begin creation of library

Added setup script
Implemented version function
Merge branch 'master' of github.com:ahamlinman/PyTICalcs

Conflicts:
	pyticalcs.c
	setup.py
adjusted logo and nav sizing for when logged out
Added Merchandise Mart to the seed file'
First commit, pre-deployment.
Merge branch 'master' of github.com:ahmacleod/solveandgo
delete azure
Removing duplicate README
slime bug workaround for map read from excel by docjure - use continuation passing style
first commit
Merge branch 'master' of github.com:ajohendran/excelToDB
fixed placeholder alignment problem
Updating README to point to new AFNetworking URL (https://github.com/AFNetworking/AFNetworking)
Modifies the query paramter function to correctly handle argument arrays. Now it adds the key[]=value1&key[]=value2 instead of key=(value1,value2) which isn't compatible with most HTTP servers.
Merge branch 'master' of github.com:BraveNewTalent/AFNetworking

Conflicts:
	README.md
First iteration of thread-safety on AFURLConnectionOperation, using a combination of NSRecursiveLock and common sense
Adding @try/@catch with autorelease pool for exceptions

Wrapping -start in lock
UIImageView shouldn't set image to placeholder image whenever an old image request comes in
Refactoring -cancel and -isCancelled
Initial implementation of batched request operations
Initial implementation of network reachability callbacks
Replacing AFNetworkReachabilityStatus type with BOOL
Adding documentation to -setReachabilityStatusChangeBlock:
JSON exception created but never raised: fix #175

In the JSON decoder an exception was created if a JSON library could not be found, however it was never raised. The exception for encoding was already being raised.
Merge pull request #178 from kgn/master

JSON exception created but never raised: fix #175
[Issue #173] Fix data length issues in AFBase64EncodedStringFromString
Adding missing raise for exception in AFJSONDecode
Merge branch 'master' of github.com:AFNetworking/AFNetworking
[Issue #158] [Issue #163] Fixing error check in appendPartWithFileURL:name:error:. Looking at the documentation for NSURLConnection +sendSynchronousRequest:returningResponse:error:, we don't really need to check error to do the right thing. Therefore, we can get away with checking data and response, and leaving the inclusion of the specified **error as an optional exercise to the user
Explicit cast in line 378 to uint8_t* needed for some build configs (i.e. mine) to avoid error.
Renaming 'class' variable to fix errors during compilation caused by some build settings (Thanks, Charlie Williams)
Removing exception caused by multipartFormRequestWithMethod:path:parameters:constructingBodyWithBlock: is called with certain HTTP methods. Although message bodies for methods like HEAD, GET, and DELETE are traditionally ignored, there is nothing in the HTTP or multipart specs that explicitly forbid the use of multipart for a particular HTTP method.
Make a basic User model (including secure passwords) (Chapter 6)
Finish user signup
Add SSL in production
repository import
Merge branch 'master' of github.com:alem0lars/c-skeleton
Updatet to use delay() function
Changed to a more accurate (still far from perfect) delayMicroseconds() function.
queue (initial check-in)
now it can get
Добавил классы предметной области(относящиеся к Call-центру) и тесты для них
added Guardfile template
use version.rb convention for gem version
watch app/assets for changes
Merge remote-tracking branch 'spagalloco/templates'
Modified main form
Modified constructo of graph class, and added functionality to options buttons
see yall in a bit, w/ 2 guests
Fixed several compiler warnings thrown by the unit test
some editiones
added flow charts section
Add edit profiles
v2.1.0-alpha1
fix #18096: fix html escaping in contact list
Merge pull request #57 from heracek/18096

Code Review for Job #18096
badges for custom thin tab bar.
whitespace issue.
Merge pull request #58 from andrewhammond/18204

Code Review for Job #18204
fixed whitespace issue. 
modifying login flow to handle expired trial periods.
adding slght pause before view pops.
lab8 with .war
modified profile,removed excess text
installed searchable plugin, testing commit
Added mongoid config for MongoHQ
add post to SC
fix post
add rescue statment
fix again
full notice
add more post fields
change post_to url to config.yml, merge with fork origin repo
fix sintax error
add managment command sync_market
improved homepage with optional email and immediate results
debuggin newsletter registration
Improve the Form validation library
Improve the Image manipulation library
Improve the Migration library
Improve the Pagination library
Improve the Profiler library
Improve the Session library
Merge pull request #816 from mrw/patch-1

Changes "ie" to "e.g." 
Fix news item href
Merge pull request #814 from narfbg/develop-calendar

Improve the Calendar library
Merge pull request #809 from pporlan/patch-1

Adding $escape parameter to the order_by function, this enables ordering...
Merge pull request #792 from a-krebs/patch-1

fix to issue #696
Updating changelog & adding a migrations documentation file so those docs can be started on.
Merge pull request #819 from narfbg/develop-migration

Improve the Migration library
Fixing soft tabs in a few files.
Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop
Abstracting the loading of files in the config directory depending on environments.
Merge branch 'patch-4' of https://github.com/kylefarris/CodeIgniter into kylefarris-patch-4

Conflicts:
	user_guide_src/source/changelog.rst
Merge branch 'develop' into feature/unit-tests
Merge upstream branch
Improve the Table library
Fixed feedback bug.
Inline editing of feedback had been scuppered due to class name change.
Not any more.
Fixed sort order of list view.
List view sort work.
Sorts most recent id first, most feedback first, most watchers first.
New managers to simplify queries in views.py
Bug fix.
With javascript turned off, "edit" link now redirects to full
edit page and not the snippet page.
html and css tweaks.
Navigation menu (proposals, decision, archived) is highlighted on all pages by passing context 'tag' into template.
use git submodule for plugins
use submodule
use submodule
use submodule
use submodule
use submodule
use submodule
use git submodule for plugins
Makin' things pretty
added HappyTruck class to demonstrate creating singleton methods on derived classes from a super class
Create and Fixing Security Controller
- Project moved to maven
- Repository moved to github
Update appdougie with jpa
re-implement NdbRMStateStore: store application   and attempt methods
typo
Changed it back
awesome config translation
сделал создание визита по кликуна ссылки и маркирую пациентов с незавершенными визитами
Afficher un lien pour l'extension de physique.
page scope is limiting projects sidebar due to a join happening, take out page for now
added square demo
Yet another complementary bugfix for CORE-4004.

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/trunk@57473 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Misc.

git-svn-id: https://firebird.svn.sourceforge.net/svnroot/firebird/firebird/trunk@57475 de594faa-8d1b-4a0c-9a6a-a7de5f8bf859
Split half left, toggles between half and 3/4ths
Deleted user specific project data.
Debug and Release builds.
builds.
New release build.
removed express, added socket.io
Merge branch 'master' of github.com:astanway/fistbump.js
pembuatan tugas p3
Added new method to set null publisher precedence
Merge branch 'mbst-1464-admin-ui' into stage
Add writable publisher set to ApplicationConfiguration
add fromKey methods to MediaType and TopicRef
set specialization and mediaType on song
Merge pull request #70 from atlasapi/mbst-3447-post-content

MBST-3447 POST content
New Publisher and new Platform values for BT VOD ingest
Merge branch 'mbst-3728-bt-vod-ingest' into stage

Conflicts:
	src/main/java/org/atlasapi/media/entity/Publisher.java
Update external/lib/basicClass.class.php
Use proper line breaks
Add support for new Google Books search results page. Fixes #439
Fix MultiScraper detect. Fixes #383.
Merge pull request #451 from aurimasv/jto

[Japan Times Online] Fix MultiScraper detect
Merge pull request #450 from aurimasv/GoogleBooks

Add support for new Google Books search results page
Fix volume and issue handling in RDF.
Merge commit '7849504515b19dc150134e0893f22f3d1c7632ac'
Merge pull request #17 from auscompgeek/d03cbd3b53419cbbafdd502644ce448e3dcd23f9

implement CTCP TIME and PING
Removed the redundant channel setting in the NCSS section of the sample config file.
Further fix for comments in config file, now more ocmpatible and stuff.
Merge branch 'master' of github.com:AClockWorkLemon/NCSSBot
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:AClockWorkLemon/NCSSBot
added g flag to regex extension
Merge pull request #18 from DpEpsilon/master

Added the g flag to the regex plugin.
Optimising webtools.py, on_incoming and trigger_g should be faster now.
Optimised youtube search. should als be significantly faster.
Fixed youube title display
Added is_ignored to controller, added ignored check to regex
Fixed escape chars in regex replacements, and took pity on users who forget the trailing forward slash in their expressions.
test - figuring out git
Merge remote-tracking branch 'upstream/master'
Implemented #22, colourblind mode in uno.
Merge branch 'master' of https://github.com/AClockWorkLemon/NCSSBot
Fixed a bug in the uno colourblind mode (thanks LaoD!)
Fixed a bug in uno.
Users must now be in a game to toggle their colourblind status.
added iframe signin path, changed inheritence for sessions controller
fixed active more
fixed progress steps
Next and previous in mygames
adding package.json as required by heroku
added support for config table
inital state of the game synced amongst joined players
Adding application.txt
Merge branch 'master' of https://github.com/babyharpseal/Mercury
Documented config/initializers/session_store.rb
Added basic UIAction support
Missed specs from last check-in
updated contact info
updated show page
Added retrieving of stages, days and act from db
Don't valiadate that
Select processes by name.
Saving work..
Travis support: Run tests and features
using org.name for getting the proivder (not using getCpKey any more seems)
Don't rely on python to generate uuid
Bump version to 2.0.3
Make KatelloSystem more type-safe
Inject Resources
Server tasks with certs now working
KatelloClientExecutionInterceptor shouldn't be needed. Need to refactor
that still
Fix Guice injection. Need to have @Guice annotation on Test class.
Conflicts:

	src/com/redhat/qe/katello/tests/e2e/ConsumerAccess.java
pulp-consumer on f16 requires python 2.7 and fails on install. Fixing to use RHEL6
Merge pull request #68 from bcrochet/certs

Certs
changing to refactored constant.
Remove extraneous debug statements that broke 1.6 compat anyway
Merge pull request #69 from bcrochet/certs

Remove extraneous debug statements that broke 1.6 compat anyway
CSSify forumdirectory
Removed documentation (pushed by accident)
Ex5 + rename package name
PROBCORE-96 Updated AnimationSelector so that it is possible to identify the model for a given history
created getter for a model in AnimationSelector
Create a way to "securely" run scheduled tasks via a shared key.
Fine I'll use Maven !
Use BasePlugin
exposed decelerating variable
add istitle Word method test
change sys.exit(0) to sys.exit(1) for errors
change implementation of Word istitle method
improve batch command efficiency by not calling subprocesses which made the Datastore reload unnecessarily (same input)
Add ability to select socket name.

Looks for all sockets currently being used by tmux. Uses tmux's
default if a socket is not supplied.
Fix typo.
Some bugfixes, removed author textfield
Initial commit

These are the max externals written in java necessary for running the
app
Finalised the RelatedTo() and RelatedFrom() methods.
Eliminated the COntology class by merging everything in the COntologyNode class.
Fixed double-click breaking popup menu
init
comunio Service
goalgetter comunio interface
start script & name verification
refactoring
goalgetter description
Merge branch 'master' of github.com:bkohrt/GoalGetterBot

Conflicts:
	bot.rb
fixes issue #473
Merge pull request #474 from tinyhippos/next

fixes issue #473
Converter E57-PCD
[DEL] Useless semi-colon from LI
debug rtl8019 ,have issue
first iteration of scaling
resolved merge issues
Episode 12

Collisons
Parser parses repository names out.
It can parse permissions.
Parser handles user and their permissions.
Cleaned up a bit
cleaned code up
removed unused transform
Edited README
Edited README
Edited README
Edited README
dedug and fixed dev branch while testing. more tests needed
fixed missing return value in nwValue
edited and tested
edited LICENSE format
Added 24hour timeframe for API returned results instead of querying all data from NW
[#WEB-781] Deletion of collapsed patient show incorrect number of studies [#WEB-778] selecting on patient level and pressing delete button - number of studies displayed in confirmation dialog is wrong
[#WEB-773] Overlapped fields phonetic and patient ID
[#WEB-772] Phonetic checkbox for Modality Worklist search area  is not translated in german version
[#WEB-758] &quot;Cutting&quot; of patients at folder end can be confusing for the user
[#WEB-804] Odd separation of studies throughout pages
[#WEB-710] Easy MPPS-SPS Link Mode
[#WEB-754] Issuer should be also specified when moving studies, series or instances
Add higher quality image as header background
Fixed float for hp activity stream
adding aci to allow for self service
Link to matches on the player page
Trial work for playing sounds. Microphone level indicator added.
Inclusao do background de patterns CSS3 e retirada de alguma propriedades que não serão utilizadas
Modificação na estrutura do html
Added formation dropdown bar, moved to play controls from play content controsl, added border radius to shape and color pickers
All models set to strict, prevent saving temporary attributes in backbone's models
Added same custom dropdown menus for article properties, cleaned up some code
Changed shape picker to mouseover, changed the default colors for color picker, made hex display uppercase
Don't download the tar ball it's not going to be installed.  Also use non-string mode def
Merge pull request #1 from tas50/master

Don't download the vmware tar ball unless it's going to be installed.  Saves on WAN bandwidt
Refactoring, slight UI changes
Now that we actually have a IP protocol tag in the config.xml we can make this check a lot simpler and do less guessing.
Redmine ticket #2503
Remove extra spaces and add closing <tr> tag
Added authentication using rails built in authentication; Changed user model password field
Test Commit newfile2
Created new module for command line interface and moved relevant classes from core.
Update README.md
updated readme
Update README.md
Update README.md
Merge remote-tracking branch 'origin/dev-bukart'
Merge branch 'master' of github.com:bukzor/buck_dotfiles into work
Merge branch 'work' of github.com:bukzor/buck_dotfiles into work
Zero now valid value of characteristics.
remove some unused style
Moved alot of code out to arthur-cpp and made deep-thought dependent on this
remove and ignore source files
merging branches
Merge branch 'coulton'
Re-edit element module. Add flow module.
Update quizgame/src/main/resources/applicationContext.properties
Formatted
Stopped using Netbeans
More reformatting
ignore .DS_Store
Merge branch 'master' of github.com:camupod/animation.js
Merge branch 'master' of github.com:camupod/animation.js
fixed linting errors
Update holamund/README.md
Committing changes made during dev meeting
only include :_type for hierarchical models if :_type isn't already included in the criteria
Added tdb2al...
Updating HAProxy documentation v1.5-dev16 generated by haproxy-dconv v0.1.0-5
Generated documentations based on haproxy-dconv v0.1.0-5
Icons for conversation option styled
Added install_options param + hack for removing package on windows hosts
Merge pull request #10 from dieterdemeyer/master

Added install_options param + hack for removing package on windows hosts
Fix route data by using match data
Pass match data back so rematching is not required to build route vars
Fix not found bug introduced with previous commit
Fix routing bugs around rerouting
Fix bug with string based route definitions
Provide method on router for looking up functions by name
Prepare presenter for request
Fix edge cases around rerouting and invoking handlers
Don't let path be nil when determining child bindings
Revert "Don't let path be nil when determining child bindings"

This reverts commit f320df9de6a06bdfdb5b49e0adf52cefe7d255e7.
Deep clone bindings when determining child bindings.
Refactor command line tool
Add argument shortcuts
peek depth completed and tested
stub files
create a google map centered above the united states
Migrated projects to VS2012

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fixed warning MSB8012

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Enable build for Windows XP

http://blogs.msdn.com/b/vcblog/archive/2012/11/26/visual-studio-2012-update-1-now-available.aspx

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Move libgit project file into build folder

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Moved OGDF project file into build folder

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated TortoiseGitSetup

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated build instructions

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Dropped unused files

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Cleanup and move all common compiler options to common.props

Inspired by TortoiseSVN revision 23717.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Renamed libapr* dlls

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Fix compiler warnings C4127 and C4512

Based on TortoiseSVN revision 23709

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
Merge branch 'vs2012'

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Try to make building the language dlls less error prone

Signed-off-by: Sven Strickroth <email@cs-ware.de>
VS2012 might create an obj dir in languages folder, ignore it

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Correctly configure referenced projects

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated libgit2 (make it compile with VS2012)

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated release process information

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Updated for MFC 11.0

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Drop unneeded string

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Added Dutch translation

Signed-off-by: Sven Strickroth <email@cs-ware.de>
Rename CT -> MTM. MachineTraceMetrics is abbreviated MTM.
Add the MDBuilder helper class for conveniently creating metadata.
Move APInt::operator! inline, it's small and fuses well with surrounding code when inlined.
Don't warn on unused member functions that are extern because of a typedef.
Accept -Wno-arc-abi without warning for a while.

Xcode 4.5 passes -Wno-arc-abi to clang, which makes a clang newer than
r163917 warn that it doesn't understand -Wno-arc-abi. I asked if adding
this is ok at
http://lists.cs.uiuc.edu/pipermail/cfe-commits/Week-of-Mon-20121015/066433.html
and nobody objected.

Adding this makes life a bit easier for the chromium project. If you think
this is a burden on for clang, shout, and I'll revert this.
Ajout importeur Point du jour
Correction cawita sur la gestion des frais d'agence.
Promo images.
color changing completed
fix odd height YUV420/YUV440 image issue
updated roles in admin section
20121015_4

1. Convert WGS-84 to Cartesian coordinates
2. Add to cartesian coordinates map
Add Contacts page
Refactor static pages code
added hashtags for companies without twitter handles
Fix post_hooks on windows
three-line prompt
Fix minor bug with element display
Move english translations to specific file and allow for overrides
Add modal dialogue to tasks pages
Add the main task board and classic view
Issue #44 Pretty-fy commit view and link to tree view
Fix to earlier backgrounds fix
Renamed confusing privilege
Fixes to image embedment in emails
Commited fix to issue #925 (http://ocportal.com/tracker/view.php?id=925). [Problems with admin menu collapse]
Fixes to phpBB import, and other misc fixes
Updated all importers to support importing from different DB server
Clarified session choice for importing
Skip over given gifts that have since been deleted
More gifts fixes
Commited fix to issue #927 (http://ocportal.com/tracker/view.php?id=927). [Catalogue grid view bugs / catalogue pagination]
vierw
Add validateNotReplayClient() method for OAuthDataProvider
Better error reporting for missing validateNotReplay*() method
Merge pull request #100 from evanp/ValidateNotReplayClient

Add validateNotReplayClient() method for OAuthDataProvider
updated images
Merge pull request #50 from ccmitchellusa/master

updated icons
Add microposts
* Associate with users
* Display on user show page
* Add sample microposts
Micropost creation and deletion
* Show user feed on home page, when signed in
* Allow micropost creation
* Show delete link on user's posts
* Allow micropost deletion, restricted to current user
* Generalize "_error_messages" partial
* TESTSTESTSTESTS
Add tests for the sidebar micropost counts
Add tests for micropost pagination
Refactor home page
Help Guard stop locking up (hopefully)
Add test to ensure other user posts have no delete link
Refactor micropost listing
Wrap exceptionally long words
issue #9 Add override keywords
Fix MyAuxFrame private enum syntax to pass thru Mac g++
Baseline
Baseline
Merge http://github.com/clemensv/EncryptFile
v2&mx version
Update notes for submitted changes

* implement v2 files api
Releasing pion-core 4.0.14
Dropboxtest 2
random-access sequence is not needed here in fact
Added window for setting easing options
Fix all tests after config refactor and add missing tests
Show all items in the system.
Add item records for oxygen and water.
folder file test
Update src/jquery.retina.js

by changing window.devicePixelRatio >= 2 to window.devicePixelRatio >= 1.2 means that hi-DPI Android devices will benefit from this plugin. I've tested this on a Nexus 7 (which has a devicePixelRatio of 1.3 and it works like a charm.
Added UI, and Drag and Drop
Cloudapp support
Merge pull request #1 from collinvandyck/pr/cloudapp

Cloudapp support
Don't use Pattern.DOTALL because it will grab links on the next lines
Merge pull request #2 from collinvandyck/pr/cloudapp

Don't use Pattern.DOTALL because it will grab links on the next lines
Update-Tested on device - No GPS
spelling fix
Merge pull request #1 from thatandromeda/master

first pull request!
Add a payload process handler
Move payload_processor to it's own file
Refactor: Extract an execute method from the payload processor
Move version file to another directory
Added companion website section
modified TopcoderTemplate
added DocumentExpireTask

Change-Id: Ie8720ab3162b19d92148bac6d08ee62e59b461df
Reviewed-on: http://review.couchbase.org/14885
Tested-by: Tommie McAfee <tommie@couchbase.com>
Tested-by: Farshid Ghods <farshid@couchbase.com>
Reviewed-by: Farshid Ghods <farshid@couchbase.com>
MB-6579: swaprebalance - kill memcached by pid

Change-Id: I4b2e350287914d5b90a1e44797771c8f7bb2df77
Reviewed-on: http://review.couchbase.org/21008
Tested-by: buildbot <build@couchbase.com>
Reviewed-by: Andrei Baranouski <andrei.baranouski@gmail.com>
MB-100: tune evperf2 config. files

Change-Id: Id427285522b9f8843796eb0496e6c114d944be73
Reviewed-on: http://review.couchbase.org/19206
Reviewed-by: Pavel Paulau <pavel.paulau@gmail.com>
Tested-by: Pavel Paulau <pavel.paulau@gmail.com>
MB-100: added fusion conf

Change-Id: I01b69b0e3fbe0657d3055077ae59f585f562aa06
Reviewed-on: http://review.couchbase.org/18395
Reviewed-by: Ronnie Sun <ronnie@couchbase.com>
Tested-by: Ronnie Sun <ronnie@couchbase.com>
Fix additional newlines in generated AR code
Merge pull request #268 from fzaninotto/fix_whitespace

Fix additional newlines in generated AR code
Remove ability to iterate over a Criteria object

This was no longer used and conflicts with other potential features
ModelCriteria implements IteratorAggregate

Now the query can be iterated on, and this executes a find() in the background:

```
$books = BookQuery::create()
  ->filterByTitle('War%'); // see Ma, no find()!
foreach ($books as $book) {
  echo $book->getTitle();
}
```

In addition to saving one line of code, this delays the actual query execution to the moment
it's iterated on. Using MVC frameworks, this typically happens in the view rather than in
the controller, and therefore it can be seen as a way to hit the database more lazily.
Fix On Demand iterator not properly reenabling instance pooling.

The previous commit revealed a hidden bug. Don't forget to close the cursor on an OnDemandIterator
if you don't iterate on it, or instance pooling will be definitely disabled.
Move Criteria::CUSTOM logic to a specialized Criterion class

Refs #41.
Move Criteria::IN and Criteria::NOT_IN logic to a specialized Criterion class

Refs #41.
Move Criterion subclasses to a subnamespace.

Because the boss said so.

Refs #41.
Move Criteria::RAW logic to a specialized Criterion class

Refs #41.
Move Criteria::LIKE and Criteria::NOT_LIKE logic to a specialized Criterion class

Refs #41.
Move logic for Criteria::EQUAL and the likes to a specialized Criterion class

Refs #41.
Rename Criterion to AbstractCriterion

Refs #41.
[Generator] Fix SqlitePlatform to generate valid SQL
Merge pull request #269 from fzaninotto/query_iterator

Query iterator
Add comment to abstract method

Refs #41.
Fix CS of new Criterion classes (using php-cs-fixer)

Refs #41.
Remove custom exception constructor signature.
Use custom exceptions instead of standard ones for Criterion errors.

Refs #41.
Merge pull request #270 from fzaninotto/specialized_criterions

Criterion subclasses
Rename ModelCriterion to Criterion\BaseModelCriterion

Refs #41
Initial work for demo of new nav
Implement new 'Browse Agencies' nav item
Implement new 'Topics Browse' nav item with autocompleter. Last 7 day counts still need to be implemented.
Enforce height on calendar and add background color for holidays.
Add ability to add a class to the calendar table. Don't show previous or next links if those months don't have data.
Fork calendar helper from topfunky to criticaljunture and revert to older version. Add commit that puts the monthName in it's own header row; helping the year select list we add to fit better.
Add second calendar to navigation. Needs a little more work.
Genericise styles for input boxes in new nav
Fix problem with path and with css scoping on entries page
Update calendar navigation to account for new nav where 2 calendars (loaded via separate esi's) are present.
Link color updates
Implement Executive Order nav feature
add support for searching PI by filing type
Implement the public inspection nav. Refactor all new navs into partials and ESI's via controller actions. Add generic document icons .scss file for future use in consolidating all related css.
Switch max comparison.

This way, only operator< must be defined to use either max or min.
Merge pull request #9 from crondaemon/master

Added transmitter support.
Bug fix when manipulating SMS body in optional parameters instead of mandatory section.
add searching transformers
Completed adding page content.
added event tutorial
fixed some typos
Throw an explicit error message to ease repack of addon using SDK <=1.5 and xpcom module.
Fix bug 711814 - console.log should prefix logged messages with addon's id
implementing per-window private browsing observer
adding some documentation
supporting the 'private-browsing' event on FF 14
comment change
removing a setTimeout
adding tests for browserWindows.on('private-browsing')
Revert "Merge pull request #475 from ochameau/bug/764831-avoid-leaking-js-proxies"

This reverts commit 983a9efe8ea2decc1f1e594799f4c0eaea5b1efb, reversing
changes made to 4985566467c1aee779f4a3e2f3b3fb426cede77b.
adding some comments
Bug 784116: TEST FAILED: test-content-proxy.testFunctions
Merge pull request #527 from ochameau/bug-784116

Fixes Bug 784116: TEST FAILED: test-content-proxy.testFunctions
use same query path as in bug 723353
using a helper method to determine when per-window PB is enabled, and updated the way that setMode works, since the setter that it used was removed.
explicitly ignoring unwanted files
adding unloader test and adding a bug fix for an issue when unloading during a PB event
using isWindowPBEnabled in test-windows.js
adding some comments about the weak ref work arounds
first commit of every file in the NetBeans project
Removed some files
Third commit
Add bundler

The bundler packages Cucumber.js to be used in web browsers.
Update NPM dependencies (close #69)

All NPM dependencies were updated to latest except browserify, which caused exceptions. Jasmine and example/server.js still working.
Added edit link for admin in blog post page.
Merge branch 'master' of https://github.com/cyberchimps/ifeature
Finished @ Uni
Added XBMC repo info
Contrail js

major code refactoring
No splitter, mellower colors
Issue #36" proposed fix plus tests
make sure Core and Tests come from the same checkout
add `onUpgrade:` clause ...

released version of FileTree bootstrapped by Metacello, so we need to force an upgrade to the version that is checked out ...
workaround for Metacello Issue 61
onUpgrade: was not the workaround
the previous workaround worked in my test image, but there are subtle differences?
woops ...
Merge branch 'issue_36' into pharo1.3: fix Issue #36
Added toggle case hotkey: Alt+u
updated progress for Tuesday, October 9th, 2012
Possible fix for issue user is having
Merge branch 'master' of https://github.com/daneren2005/Subsonic.git
Remove help menu item from all but main menu
closes #82 Added basic about dialog
more music classes
setup new design navigation bar at the bottom of the screen
Added base classes for testing islandora and its solution packs.
Moving cutpoint calculations out of main display loop.
Added Digital Pigeon to the examples list
swith to monospaced font
Made the Steps Description Mex Width relative so that it works for both 4/3 and Widescreen.
Revert "Fix encoding errors while downloading web pages"

This reverts commit 533c1be7146662bc8d79ddfd318116981341e786.
Revert "Fix encoding errors while downloading web pages"

This reverts commit 3cd9940910d9ef60de287fd4f78474253d322e5d.
Add support to bzip2 compressed log file
Fixes to work with integration build

Review URL: https://chromiumcodereview.appspot.com//11312089
single page and featured branch display issues
Merged carls code with my code for style rewrites for posts and featureds
Merge commit 'sf.displayissues.r05' into pen15
Merge with Sebastian's code
Changes to the single page post
Merged with integration
Major Style updates
Massive style updates
Major Major renovations in styling and HTML
Pulled in right shc-sso-plugin commit
aj is all fucked up agian
reintroducing aj plugin as submodule
Fixed issue with exception being thrown during screen name validation
Changed the end point to the demo vm
Control panel login
renamed animationMode to animationStyle
work you?
Bug fix to anchors
suckermeter link update