labofsahil/github-event-dataset-2012 huggingface dataset:
Robot work
Merge branch 'master' of github.com:nmc499-horizon/HorizonGame

Conflicts:
	Assembly-CSharp-vs.csproj
	Assembly-CSharp.csproj
	Assembly-UnityScript-vs.unityproj
	Assembly-UnityScript.unityproj
	Assets/HorizonGame/Materials.meta
	Assets/HorizonGame/Materials/Face.mat
	Assets/HorizonGame/Materials/Face.mat.meta
	Assets/HorizonGame/Materials/Metal.mat
	Assets/HorizonGame/Materials/Metal.mat.meta
	Assets/HorizonGame/Materials/New Cubemap.cubemap
	Assets/HorizonGame/Materials/New Cubemap.cubemap.meta
	Assets/HorizonGame/Materials/Robot_Body.mat
	Assets/HorizonGame/Materials/Robot_Body.mat.meta
	Assets/HorizonGame/Materials/Rubber.mat
	Assets/HorizonGame/Materials/Rubber.mat.meta
	Assets/HorizonGame/Materials/jade copy 1.mat
	Assets/HorizonGame/Materials/jade copy 1.mat.meta
	Assets/HorizonGame/Models/Robot/Robot Animation.prefab
	Assets/HorizonGame/Models/Robot/Robot Animation.prefab.meta
	Assets/HorizonGame/Models/Robot/Robot.blend
	Assets/HorizonGame/Models/Robot/Robot.blend.meta
	Assets/HorizonGame/Models/Rover/Materials.meta
	Assets/HorizonGame/Models/Rover/Materials/Face.mat
	Assets/HorizonGame/Models/Rover/Materials/Face.mat.meta
	Assets/HorizonGame/Models/Rover/Materials/Metal.mat
	Assets/HorizonGame/Models/Rover/Materials/Metal.mat.meta
	Assets/HorizonGame/Models/Rover/Materials/New Cubemap.cubemap
	Assets/HorizonGame/Models/Rover/Materials/New Cubemap.cubemap.meta
	Assets/HorizonGame/Models/Rover/Materials/Robot_Body.mat
	Assets/HorizonGame/Models/Rover/Materials/Robot_Body.mat.meta
	Assets/HorizonGame/Models/Rover/Materials/Rubber.mat
	Assets/HorizonGame/Models/Rover/Materials/Rubber.mat.meta
	Assets/HorizonGame/Models/Rover/Materials/jade copy 1.mat
	Assets/HorizonGame/Models/Rover/Materials/jade copy 1.mat.meta
	Assets/HorizonGame/Models/Rover/Robot Animation.prefab
	Assets/HorizonGame/Models/Rover/Robot Animation.prefab.meta
	Assets/HorizonGame/Models/Rover/Robot.blend
	Assets/HorizonGame/Models/Rover/Robot.blend.meta
	Assets/Materials.meta
	Assets/Materials/Face.mat
	Assets/Materials/Face.mat.meta
	Assets/Materials/Metal.mat
	Assets/Materials/Metal.mat.meta
	Assets/Materials/New Cubemap.cubemap
	Assets/Materials/New Cubemap.cubemap.meta
	Assets/Materials/Robot_Body.mat
	Assets/Materials/Robot_Body.mat.meta
	Assets/Materials/Rubber.mat
	Assets/Materials/Rubber.mat.meta
	Assets/Materials/jade copy 1.mat
	Assets/Materials/jade copy 1.mat.meta
	Assets/Robot Animation.prefab
	Assets/Robot Animation.prefab.meta
	Assets/Robot.blend
	Assets/Robot.blend.meta
	HorizonGame-csharp.sln
	HorizonGame.sln
	Library/assetDatabase3
	Library/guidmapper
	Library/metadata/21/21dcf2284a3cd0245b47469ad94eecfc
	Library/metadata/2c/2c8328a77b2455148b3e952fa67fd08c
	Library/metadata/32/32c62be87abfd3b45a34e88efc0dde4d
	Library/metadata/3f/3f24921765f2275438ad462e675b98e3
	Library/metadata/44/449b48f7eb5d87a4baaa5fb73f875a59
	Library/metadata/52/52333cce1a83942ceaf3f0c882e50812
	Library/metadata/60/60c73a8716dac5444bc9944f71a63a8a
	Library/metadata/88/88c8123e38eb07244a98eb3b799ac461
	Library/metadata/a8/a8470598c3b7d1e4aa059a8844e4e45d
	Library/metadata/ec/ec1c3ddb8dee181448f9db9c7e2a766b
fix #25
Merge branch 'master' of https://cdfcdf@github.com/nolastan/Frat-house-tycoon.git
Fixing bad signature encoding
Site updated at 2012-11-21 10:20:23 UTC
Octopress init
Site updated at Fri Jul 27 08:49:09 UTC 2012
add startup script
Merge branch 'project' of github.com:oderby/6.824_final_project into project
タイトルが間違っていたので修正
Site updated at 2012-08-19 23:32:50 UTC
fix cron jobs
Added check for null return from MessageHelper.getMessageFromToken
Merge branch 'master' of github.com:DawnScience/dawn-workflow
Merge branch 'master' into merge-8.0
Modified seeded Events
Restyled pagination for events page
Comitting updates to .gitignore

Copying 'ignore directives' from the production branch, so ignored
directories and files in the production are also ignored when the
drupal-contrib branch is checked out.
Merging in shared libraries directory from production branch.

Shared libraries actually need to be available in the drupal-contrib
branch so drupal core and contrib modules can be updated using drush
command-line tool. (Modules were generating errors because they
couldn't access the shared libraries.)
Committing module updates

Modules updated: transliteration
Cleanup

git-svn-id: http://svn.openstreetmap.org/applications/editors/josm/plugins@28936 b9d5c4c9-76e1-0310-9c85-f3177eceb1e4
Added ubuntu terminal
Fixes #1: added settings.xml and updated README.md to build successfully if you don't have JBoss repositories in your local settings.xml.
Fixes #1: added settings.xml and updated README.md to build successfully if you don't have JBoss repositories in your local settings.xml.
Merge pull request #2 from vetler/master

Fixes #1
Rewrite to newer style (load js libs).
Fixed #7 横浜データでのBubble Treeの実装
adding orlando.delagui.la to CNAME
first commit to our repo
refactor spec and fixtures
refactor crawler
rename fixture/list.html to fixture/venture.html
End time change.
Renamed files to make them Windows compatible.
Added initialization strategies to EM
Progress bar only rewrites when changed, percent is an int
cm: init.rc: Fix compcache and cleanup init file

The "import" keyword is only parsed once, for a one shot execution, during
the initial section setup, and before running "on fs". Having an import of
a file that's located in a filesystem other than root will result in an error
like

<3> init: could not import file '/system/etc/init.local.rc' from '/init.rc'

So... any files imported into init need to be moved to the root fs.
While we're at it, move init.rc changes that are specific to CM (and don't
involve modification of preexisting configs) into this file, to ease future
upstream merges (and minimize breakage on devices that override init.rc with
their own variants)

Needs to be paired with the corresponding system/core patch

Change-Id: Iab6340db2e28ef19dbcd84ae5c71737ce0cd491f
built-targets: resort alphabetically

Change-Id: Iaa5551cb38c014a04bb21290cc1cabd010b5aee2
jenkins: add p4wifi, p4vzw, p4tmo, p4 and p3

p4wifi: GT-P7510
p4vzw: SCH-I905
p4tmo: SGH-T859
p4: GT-P7500
p3: GT-P7100

Change-Id: I9bd208ab5d4cafb16516984b7dbb51b4c8aa7dc9

Conflicts:
	jenkins-build-targets
Remove debugging value...
Update preloading of button bg.
Fix a typo in dropbox text.
Progress bar emulation.
Improve style of emulated progress bar.
Fine-tune .item style.
Remove unnecessary logging.
Added libboost-system-dev, increased minimum recommend free disk space to 500 MB
UNDO an optimization to make rendering work better
(especially when the enclosing div has "position: relative;")
added missing files; deleted unused functions; added a few comments
Merge pull request #10 from nigma/invite-fixes

Corrected reference errors in signup code send email method
Fixed date in sitemap.
Down to 2.1.0 since npm declares < 2.2.0
Release 1. noarch, cleaning.
Set width and height to 0 in site config to let PMS use the total area of the Flash player.
Update app/views/assignment/_content.html.erb

Changes for E704
GUI Prototype mit Baumstruktur
HYDRA-848 Fixed create!()
Added an exception catch to SOAP function calls.
Improved 'gform_field_input' filter.
WordPress Coding Standards optimizations.
Added .gitignore file.
Moved uninstall function to uninstall.php file.
Added consumer IBAN and BIC number to payment.
Removed drop table function, now simple call in uninstall.php.
Improved handling of iDEAL v3 status request.
Site updated at 2012-09-05 11:01:28 UTC
Site updated at 2012-09-02 15:49:08 UTC
Site updated at 2012-09-06 05:21:06 UTC
new blank css file
Add ignore domain pipeline.
Add support pipeline.
Add should run to domain pipeline.
Remove 'pipeline' from naming to read better in logs.
Alter context to be instance var on pipeline to support adding in should run.
Teacher map View now displays hunt boundary
Added HttpClientFactory member to the ClientConfiguration to allow custom instance
Made HttpClientFactory public (to enable extending)
Fixed NPE occurring on GAE
Few dirty change to make it compile...
Added readme
Changed the sections about {{CORDOVA_SCRIPT}}
Some HTML5/CSS fixes
unified READMEs
add LinkedStack
version bump
handle not being logged in
version bump
add more logos
fix logo fixes
Added Main source file
call presentedViewController on the viewDeckController if it exists.
Minor update for ViewDeck on iPad.
Merge branch 'rea-changes'
Revise to use Rails 3.2 tutorial.
Remove old bin folder.
Only require certain fields on publishing an annual update without having a complete application
working with raphaeljs version 2
cpufreq: interactive: always limit initial speed bump to hispeed

First bump speed up to hispeed_freq whenever the current speed is below
hispeed_freq, instead of only when the current speed is the minimum speed.
The previous code made it too difficult to use hispeed_freq as a common
intermediate speed on systems that frequently run at speeds between
minimum and hispeed_freq.

Change-Id: I04ec30bafabf5741e267ff289209b8c2d846824b
Signed-off-by: Todd Poynor <toddpoynor@google.com>
(cherry picked from commit b47148d9c2cc2f63eca7c7211b825501b2980bc0)
Rework frequencies
UiFastWifi name has changed to wifi_pm
aih243 & aviator

Aamer Husain + Jeff Dolan
added Keo tests.
Idempotency for iTerm.app installation
readme: correct blackfin entry in the driver support matrix.

Signed-off-by: Richard Cochran <richardcochran@gmail.com>
Site updated at 2012-04-18 21:25:54 UTC
removed changes to button
- seems I need to generate the site on my side because github can't run
the plugins on their side (security issues)
changed everything to github
Rebase from 'release/moveit_ros_warehouse' @ version '0.2.6'
Generated debian files for quantal
問題5を修正
autotester-127 - Verify the Reputation bubble on dashboard matches surveys or reviews
Added some slight missing code
Added install generator for admin assets
remove credit total
Merge https://github.com/gogogoaldi/spree_simple_dash
Add gitiosk config
Merge branch 'master' of github.com:ryandotsmith/queue_classic
remove scrolls dep
update link to configuration options
document splatting args when retrying failed job
Merge pull request #75 from lmarburger/update_config_link

Provide more accurate instructions for retrying failed jobs.
API is now working with the new schema design
Fixed the readme section
Fixed API description
Routes for the API are now separated from the main app.
new index page
integrate html for change password and job details
fix to avoid setting the persist.sys.usb.config in default.prop
Version 0.02: initial_data.json provided for syncdb
remove sqllite for heroku deployment
Merge branch 'modify-Gemfile'
modify gemfile.lock
base-slim-tb
Добавен ER модел като картинка
Добавен .gitignore
committing to sprint002
first commit testing

Conflicts:

	DemoProject_githubtest/src/de/test/github/DemoProject_githubtestServlet.java
	DemoProject_githubtest/war/WEB-INF/classes/de/test/github/DemoProject_githubtestServlet.class
	DemoProject_githubtest/war/WEB-INF/web.xml
Merge pull request #1 from saurabh447/sprint002

Sprint002
Site updated at 2012-04-08 07:25:50 UTC
Fix some CSS & some beautifications.
Fixed some issues with this template.
fixed bug with reused counter variable
updates to include linux/windows projects but untested
releases released
- Fix misc coding style

[git-p4: depot-paths = "//src/rake-remote_task/dev/": change = 7878]
- Add documentation for +command_prefix+ in +run+

[git-p4: depot-paths = "//src/rake-remote_task/dev/": change = 7879]
wacholder encoding und unifying
IEmployeeMembershipService updated and

GetEmployees method added to EmployeeMembershipService
Small glitch in OnOver

Very minor glitch found inside of TiledObj that fixed the unreliability
of the OnOver method of grid components on the firld.
.zshrcを追加。.gitconfigを修正
Finished but with a few exceptions
Fixed the issues of splitting words in string literals
Bad fix for non-PortalResiliencyAction response
Commit with all analysis files.
Added Exoskeleton to the projects page.
Modified resume.
Removed DS_Store files
added in gitignore to ignore all DS_Store files
LWSCGI: adds "Domain" property.
added video_views api and 3 attributes in video model
[bugfix]

jstat library line changed
Site updated at 2012-08-01 20:28:50 UTC
Changes designed for integration with freemail: Modified active object notification to be able to send without specifying a controller, and ask for exactly one message to be sent. Created an object for instant-messaging based on http-in.
Added specs ensuring access tokens and auth codes are destroyed w/
auths.
Tweaked after destruction specs for mongoid compat and implemented dd in
mongoid
Added explicit setting of timeout to fix iOS6 timeout bug
Renamed all classes to have prefix "GG" (GiraffeGraph)
Added global operation queue
Added type checking for public methods
Removed -1009 connection error (NotConnectedToInternet) from displaying in NSLog
free(msgBuffer) added in case of error
integrated in new function a bit better
Make sure writeToFile works
make sure write works
modified window gui
Add initial tests setup
Merge pull request #51 from Xerkus/feature/test-setup

Add initial tests setup
Merge pull request #51 from Xerkus/feature/test-setup
Remove onbeforeload handler when done
Memoized the marker removal function; this might make it average out to be a linear-time computation.
fix menu para administrar contratos y Consultar contrato
Rest API scheme coordinated with Sharath
updated. still not "proper" puppet manifests. but working."
Process cannot stop when rm fails. Just continue.
Merge remote-tracking branch 'origin/master'
More trace in report building, to handle Korean output.
New post: super-resolution paper.
Started with security
Added support for SP ACS metadata publishing.
updated git ignore
adapted Travis-CI build script
Remove configuration, just check for spin
change to 411

because that's the what the subdiv file needs
本番環境でsocket.io.jsのキャッシュが効くようにした
Added a little note
Added Jquery tools library for Wizard based checkout
Agregando elementos al carrito de forma asíncrona
Agregando el manejo de estados en la llamada async
Agregando trace para hibernate en el log y quitando de Datasource
Creando un servicio y usandolo en el controller de Store
Usando session y tx de la clase de dominio
Probando eventos en el GORM
Agregando caché a las consultas comúnes
Agregando recursos al mapping y usandolos en el layout
Agregando plugins de resources complementarios
Agregando el plugin de webflow y corrigiendo dependencias de error
Agregando un mapeo a las URL's
Agregando un flujo simple
Agregando Serialializable para Flow
Agregando el estado final
Agregando el método de negocio
Agregando vistas para el flujo
Ajustando el estado final
Agregando el plugin de Quartz, creando un Job
Agregando clases de Seguridad del plugin
Agregando seguridad al controller de Store
esxml?
fix
use relative font sizes. Remove un-needed code from impress.js demo
Let except rise more one level
Initial commit
bundle updating sqlite3
These are my new changes
These are my new changes
These are my new changes
These are my new changes
These are my new changes
These are my new changes
Initial commit
add tiwlan.ini
Add bootmenu and linaro build options
Wrapped DebuggingFearLwjgl in LoggingFearGl
created empty latex project
ajoute fileChooser et correction erreur ouverture graphique
better focusing for list
settings reset after reset press
minor layout fix on the .dev label in textbox
More tiles added to lavatiles.png -- more to come.
Nick: We now use requirejs to manage dependencies
start game modified
Use local version of runST in D.H.Strict
Change-Id: I84ba444f99193b83d98b1ee5412506bbbe836718
Implemented new codestyling
change overwrite to into
Explicit returns are ok in methods, not blocks

- Removed line that said to avoid explicit returns
- Added line and code examples that state to avoid returns in blocks specifically
Various grammar and styling changes
DE5 - Games screen will display no games upon login of player with no "contestants"
some are tested in _config.yml
push a blog
update the post content
Final Fix for the boxfile
making more progress on getting different field views in the different view modes
Site updated at 2012-09-19 21:35:30 UTC
WebServeltTest.java を InitParamServlet.java にリネーム。
プロパティファイルを読み込んでその内容を書き出すサーブレットを作成。
Added euler22.cs
to show the usage of QRegExp
Test of the notes / papers / essays
stuff
social
new file:   index.html.erb
powr up moves goodcd FoldIt3D_finalGame/
Site updated at 2012-07-31 02:58:12 UTC
Adding test prototype for still images
Fixing ntp_end and ntp_start typos. Time editing now works
Adding screen resize controller so that SVG canvas doesn't go off-center
Changing event listeners in canvasclickcontroller
Fixed canvasclick listener issue
Adding comments in canvas and controllers
Merge pull request #23 from jdickie/master

Updating and Fixing some bugs
added module
added module (2)
image
for future standalone english version
removed updateLabel from index.html
Merge branch 'master' of https://github.com/vejersele/jQuery.mobileNav
update
formated print cache function
Added stats printing
New arrows - negative and positive
Added a lib for twitter integration
Income per month
Income & spending per month
Updated planet loader and species
add index.md content file
Added links for Terms of Use and Privacy. Also disable the call stack being displayed in the error page
Fixed a couple typos in HB 368 writing
1.1.8 versioning.
Added Screensaver Lock
update to sp vm article
add new pages.
projeto básico
Update ads

Attempting to center align
Testing which readme is the best
[spotify-beta] Use aur/libpng12
Site updated at 2012-09-28 02:44:10 UTC
MX resolver sample code (to be integrated)
Site updated: Wed Nov 14 2012 00:41:09 GMT+0800 (HKT)
change email href prefix
Merge branch 'master' of https://github.com/yaongli/yaongli.github.com
Merge branch 'master' of https://github.com/yaongli/yaongli.github.com
A draft

something uncompleted
added BibleReadingMenulet.
small changes in settings, fresh rebar
try #2 to get paths correct on live site
edit metadata defaults and add entry.date to post header in index
Merge branch 'master' of github.com:zakkain/zakkain.github.com

Edited posts in prose.io
Update docs/languages/en/user-guide/styling-and-translations.rst

application->Application for consistency in folder naming.
Pregenerated files naming fix and fix restore flash

Signed-off-by: zombah <zombah@gmail.com>
Added /q/rejected check
Fixed problem with checksum string comparison
.git* files shouldn't be added
warn if the VMWare install cd is not available
textbook progress: pdf p. 157
textbook progress: pdf p. 165
Finally, after solving a stupid objc_removeAssociatedObjects(pointer to nil) bug, textbook progress: pdf p. 166
[Build] Update maintainer mode flags

Add -DGLIB_DISABLE_DEPRECATION_WARNINGS to CFLAGS in maintainer mode builds.

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>
[Fix] Remove useless check

There is no point in comparing SYS_CONFIG_DIR to NULL.  It is always
defined.

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>
[Fix] Remove useless check.

There is no point comparing new_string to NULL.  It is always non NULL.

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>
ApiLoader: Load the L10n library.
Use correct database.yml for capistrano.
Nginx on 8080 behind Varnish.
Merge branch 'master' of github.com:1337807/son_of_store_engine
Revert "Add layout"

This reverts commit e21c93537db5ca7cd92af95d7c5822fb0f45a906.
My Third Commit Apr 06 ending with example 13
Add itarive method for searching Fibonacci numbers

and testing execution time for recursive and iterative method for
searching Fibonacci numbers
一般api的封装 done

Signed-off-by: azrael <azrael@imatlas.com>
Merge branch 'master' of https://github.com/AlloyAndroidTeam/AlloyWeiBo

Conflicts:
	src/com/alloyteam/weibo/AccountManagerActivity.java
	src/com/alloyteam/weibo/HomeActivity.java
more letter styling
Merge branch 'master' of github.com:Andrewglass1/teacher-center
Fix .cabal file so library is only compiled once.

Also tidy module imports and requirements
Edited the test configuration
Minor update in Distributed CommandBus sample
Wed Jul 11 08:00:07 EST 2012
[Bleeding] Call a LAVA BlockIgniteEvent in another place in BlockStationary. Fixes BUKKIT-970

Also adds CraftEventFactory.callEvent(Event), which returns the event called. Currently only used for n.m.s.BlockStationary's lava
BlockIgniteEvent calls.
Added BlockRedstoneOre for diff visibility.
Made stepping on Redstone Ore fire PlayerInteract events for players, EntityInteract events for other entities. Fixes BUKKIT-1163 and fixes BUKKIT-1182

Note: the client seems to predict redstone ore interacting, so you may see
ore lighting up when it shouldn't be. However, cancelled events should
function as expected.
Added PlayerAbilities for diff visibility.
Stop loading the 'flying' setting from player.dat until it is properly implemented and used in NMS. Fixes BUKKIT-1183
Fixed EntityDamageByEntityEvent to call for every attackable entity. Fixes BUKKIT-1129, Fixes BUKKIT-1054 and Fixes BUKKIT-147.
[Bleeding] Fixed maxStack being incorrectly set to 0 in custom craft inventories. Fixes BUKKIT-1181
Call DamageEvent before CombustEvent for Arrows. Fixes BUKKIT-1100
Stores the images locally. you MUST create a images folder in the root of your application.
Merge branch 'master' of github.com:CCSCloudComputing/BookKarma
Loading screen for Search Bins :)
Improved layout for create task
Removed the status field because it was unneeded.
Implemented stop, resume, wait, status, wwrite, a moving constructor.
Added more testing to cover the copy constructor, wait, resume, stop, wwrite, etc.
api versioning&api_key
MLC branding
Low: Filesystem: support loopback
Merge pull request #88 from t-matsuo/Filesystem-patch

Low: Filesystem: support loopback
Añadido funcionalidad de VIM. Falta añadir el directorio de plugins
Mejorando función genérica installAndConfig y probado con vim
Created a standard Android Project in Eclipse, added an AndEngine lib file and updated MainActivity.
Added API for AndEngine
Modified the gitignore file
Removed machine specific files
Removed one more machine specific file
I think these files are needed for the Eclipse project.
Drew main menu and select modes views.
Updated the art info file.
Added the project description file.
Updated the project description)
A proposal to a code skeleton
Modified the code skeleton
Merge branch 'classSkeleton' into develop
Added vecmath lib and updated classes skeleton
Cleaning up the class skeleton
Added ItemID and added simple class javadoc
Added test class for BulletProductionQueue
Formatted all src files
Merge branch 'classSkeleton' into develop
Removed the old class skeleton
Added team meeting notes from today via R. Barine
initialization and json response complete
comparison methods are A'GOOOOOO
Fix tests to reflect bay area addresses
Finish shorter_distance method
renamed MapData class to TripData
Merge branch 'api_wrapper'
Merge branch 'master' of https://github.com/Devbootcamp/DB_MagicFoolbus
Add a README

This was mostly added to make GitHub happy, but also to demonstrate to
end users how GitHub will happily render a website for you.
Merge pull request #35 from dritter/master

Login läuft
Merge pull request #36 from ErrorProne/master

pottaufschlüsselung implementiert
Rangliste ueberarbeitet
Merge branch 'master' of github.com:perprogramming/bonnliga-website
Performance
Performace
Diverses
BUgfix
Bugfix
Turniere optimiert
Locationdetails erweitert, closes #33
Remove Rake tasks (not needed?)
Fixed multiple invalid damage values appearing in NEI for double slabs. Fixes #133
Fixed tripwire hook recipe.
Fixed NPEs caused by hard disabling biomes
Agregados el gitignore(era hora, no?) le make la consigna ylas pruebas
Updated to Gedcomx version 0.15.0
Test-connection with database
Renumbered C01S05 exercises, minor docs changes.

Signed-off-by: robert <robert@feetwetcoding.com>
Moved files into lib directories.
Fixed macOS crash in ColorNames exercise.
Fixed compiler warnings.

Signed-off-by: janice <janice@feetwetcoding.com>
Merge branch 'dev' of git://github.com/rdholder/FeetWetCoding.git into dev

Conflicts:
	FeetWetCoding.pro
Changed comments, added Switch1.

Signed-off-by: robert <robert@feetwetcoding.com>
Changed wording in Primes2 explanation.

Signed-off-by: robert <robert@feetwetcoding.com>
Add Classes1 exercise (still empty).

Signed-off-by: janice <janice@feetwetcoding.com>
Merge branch 'dev' of git://github.com/rdholder/FeetWetCoding.git into dev

Conflicts:
	FeetWetCoding.pro
Added placeholder for first event handling exercise. Fixed compiler warnings.

Signed-off-by: janice <janice@feetwetcoding.com>
Reduced number of calculations in Primes2
so that it doesn't hang quite so long.

Signed-off-by: robert <robert@feetwetcoding.com>
Merge branch 'dev' of git://github.com/FeetWetCoding/FeetWetCoding.git into dev
Removed superfluous path/filenames from comment headers, all files.
(I think.  :-)  Some new exercises too.

Signed-off-by: robert <robert@feetwetcoding.com>
Docs changes:
Removed ToDo page. (Using google code for issues now.)
Other minor docs changes.

Signed-off-by: robert <robert@feetwetcoding.com>
Fixed footers globally in helpndoc file.
Fixed two small exercise dialogs.

Signed-off-by: robert <robert@feetwetcoding.com>
Started exercise TheEventLoop.
Nothing here yet, new code is experimental and commented out for now.

Signed-off-by: janice <janice@feetwetcoding.com>
Merge branch 'dev' of git://github.com/FeetWetCoding/FeetWetCoding.git into dev

Signed-off-by: janice <janice@feetwetcoding.com>
Created mycode stuff.  Doc changes.

Signed-off-by: robert <robert@feetwetcoding.com>
Merge branch 'dev' of git://github.com/FeetWetCoding/FeetWetCoding.git into dev
Move exercises out of the GUI thread.

Signed-off-by: janice <janice@feetwetcoding.com>
Merge branch 'dev' of git://github.com/FeetWetCoding/FeetWetCoding.git
into threadtest

Conflicts:
	FeetWetCoding.pro

Signed-off-by: janice <janice@feetwetcoding.com>
Fix errors from previous merge.

Signed-off-by: janice <janice@feetwetcoding.com>
Mappped, and  autonomous
fixed the all inclusive action pattern
print utility added for little world
删除git上面的bin
删除git上面的bin
删除git上面的bin
Redirect Input
Added setDeviceMaker for REGEX_PC_OPERA
First version of the Examples page, with default image.
switch to rvm in bash_profile
Adding top border to footer sections.
图像机构构筑完成

色调变换待。
Added nodeNFA
Added users link
Finished deleted issue
Change Registration class
adding docs for the developer plugins
Added BitVise Tunnelier 4.50
Disable desktop icon, bump to 4.50.101012
Allow usage of private setters/getters.
Merge pull request #17 from SimonVT/dev

Allow private setters/getters
Adjusted Comments and removed test code + var_dumps
some minor mods
Add rule-name system. Every input rule can now have a name, that could help e.g. the microcontroller to know where a signal comes from.
removed getDomain method
removed match interrupt.
Add CursorMoved event support.
data...
Updating...
added intro ascii and Weapon class.
Changed the uptime checking
JHtml doesn't need to depend on JDatabase.
PostgreSQL 8.3 doesn't support 'RESTART IDENTITY' clause inside
'TRUNCATE TABLE' query, so switched to old-style restart sequence query
that it is supported from 8.3 to 9.1 .
Driver tested on following PostgreSQL's version:
- 8.3.18
- 8.4.11
- 9.0.7
- 9.1.3
So this changes of $dbMinimum to 8.3.18 .
Merge pull request #1249 from gpongelli/pg_oldVersion

Changed PostgreSQL's minimum version.
Merge pull request #1237 from realityking/date

JHtml doesn't need to depend on JDatabase.
Making some initial adjustments and additions for Phar packaging.
* Preparations for adding/switching to Stylus
Yep, it's beta! And it works.
restructed project
Rename CodeDataLoader.java to DataSourceLoader.java
interface_def is improved.
Changed back the names of events (due to naming convention in Pf4wp - will need to be redone)
Rev 0.4 updated .exe and binary.out file
Added the SML Major Mode page. Also tried to provide an emacs icon for the favicon, and removed the references to using the twitter bootstrap touch icons.
remove preprocess image setting
Ajout du driver Servo:
- Utilisation d'une classe init appelée dans le setup de l'arduino :
les méthodes ne peuvent pas êtres appelées en dehors du main
=> formaliser avec les autres drivers et faire un truc générique

La doc, fock off pour le moment, on verra après la coupe
Merge branch 'master' of aphrodite:userspace-usb-serie

Conflicts:
	arduino/userspaceUsbSerie.pde
	pc/main.cpp
float profile images left
Szkic UseCasow
[Release] Version 1.0.1
Added a little info to README.md
delete travis yml file
flake8
Added a performance test
test updates, fixes
Added cluster module support
New welcome message for repository
Final commit. Includes changes to the README file
Merge remote-tracking branch 'upstream/master'
Versão com problema no reconhecimento da classe BoostsTrapper.
added fifDjangoDjourney.rb
LSR: also setup the pin mux: wifi now works on tiwi-ble module

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pom updates
pom updates
den bästa commiten någonsin
Merge branch 'master' of
ssh://git@github.com/SezarKarbojian/GitHubOvning.git

Conflicts:
	gitHubOvning/src/lesson/MainClass.java
	
	hej ehj
[LITEST] At this stage I see no need for any ban management to be done by the proxy
update fb dialog box
Stupid annoying LF CRLF convertion >:-\
Merge branch 'master' of https://github.com/Snegovikufa/OmniBackupGantt

Conflicts:
	src/widgets/mainwindow.py
Merge branch 'master' of https://github.com/Snegovikufa/OmniBackupGantt
Add sessions plot. Replace tables with QStandartItemModel
Removes russian labels
Changed shiftbuffer
Changed shiftbuffer
Core/Scripts/OS: Add Lava Strike

* More cleanup
sample doctests on dialer_campaign functions
Update feature/survey-branch
mix fix pep8
New therapie page created and links updated
Skrev litt på future work
Fiska et space i description
Refactored Camera Class

Also added comments to Main.
fix ota settings

Change-Id: I62b732cdde8d4b0d73c871477db870cf62039663
start of report
added a trace
finished the new option hide_read_more_link for the list post template generator
added the read_more_link option to the list_post_atts in the listposts function in shortcodes.php
made the options working in the loop templates itself
Merge pull request #366 from konradsroka/master

Mixed Pull "Agatha"
Add all featured post options to the featured post widget

add multiselect for select post types in list posts and the slideshow

change the cc_list_posts query
Merge remote-tracking branch 'themekraft2/master'
widgetarea creator ready ;-)
Merge pull request #321 from svenl77/master

widgetarea creator ready ;-)
add initial menu identifier list settings
change admin tab labels
add initial settings for images
change "factbox" and "quote" alignment attribute to a select
add blank pagelayout
add html5 javascript file for Internet Explorer support
add default stylesheet files
add initial user specific stylesheet files
add Internet Explorer 7 specific stylesheet
add support for CSS3 styles in Internet Explorer
add debug settings
add available classes to the "ul" custom tag
override pagination template
override template and add settings for the sitemap
add settings for permissions
enable delayed indexing for search
override infobox template
add base framework files and settings
override search template and enable search facets
set sitelink to be link handler for the menubar template operator
implements basic passenger carrying behaviour
added base folders
set chara-code to utf-8
added codes
added codes (not run)
3.3.5: fix parsing of SMSG_SPELLLOGEXECUTE
Rename 3 SplineFlags, from Mangos (thanks vincent)
4.3.4: 6 opcodes by Horn
Handler for SMSG_GUILD_MEMBERS_FOR_RECIPE
Third portal import initial submission
Third portal bug fixes and enhancements
Cleanup search logging
Import -> Upload

Email normalization and cleanup
Add recipient name and email for other institutions upload
Add email link for invalid imports
Add a category for unpublished imports

Also show an email link for them, and invalid imports as well.
Add reports for other institutions upload
Adjust select widths
Add holder as cc to change request mailto links
Update column name for PDU and IDU rooms
Update names of data uploads
Update report names to match updated import names
Fix swapped symbol and official mouse name for change request emails
Include recipient email for submission emails
URLencode mailto links
Adjust text of emails
Prettier data uploads page
Add unpublished report
Navigation tweaks
Delete unused pages
Adding initialize method to the Authority class for easier modding
Extrator preço :: Etapa 2(Incomplete)
Fixed the pom. No more license plugin stuff for now.

Signed-off-by: Jessica Xia <thejohntitor2036@gmail.com>
Restructure to correct directory structure
Signed-off-by: Jessica Xia <thejohntitor2036@gmail.com>
Merge branch 'master' of https://github.com/VolumetricPixels/ChatExport
Mostly Done!

ToDo:
Optimization
Testing

Signed-off-by: Ollie <dzineit@live.co.uk>
Use database.rb and not database.yml .... thanks to @nesquena to check
my ugly code :D
grub2: gfxmode and gfxbackground support

This patch implement the get/set grub2's config for global options
gfxmode and gfxbackground.
grub2efi: console options support

This patch implement the get/set grub2efi's config for console
related global options gfxterm, serial, gfxbackground and gfxmode.
Fixed some tests issues.
Fixed links in base template
mensagem teste para o tutorial
testando
Design changes

This is what it will look like when in play.
BLLSession and BLLTicket udpate

Also the same movie added into the session with different times
added language chk boxes
added tag autocomplete stuff
Added mapping from/to array/list/map
Managed object context now initialized on Alloc, addWithArray now returning arrays of objects.
Better fix for managed object context initialization
Setting concurrency type of temp context.
Merge pull request #1 from MattFoley/master

Concurrency of temp context fixed.
Drop table method added, batch sized made adjustable on init and on the fly.
Changed name, rearranged header to organize method names, removed DLog.
Update README.md

Updates for current Pull Request
My bad.
Jeeeez, I need to stop juggling four things at once.
Merge pull request #2 from MattFoley/master

Drop table method added, and batch size of FetchController adjustable.
merged in changes
added signature and test to verify we return a bad request 400 if signature is not valid
password recover redirection content tests
Added a more detailed README.
1st commit

Signed-off-by: Abraham boray <abrahamboray@gmail.com>
Fix problem with swapped out link contents in pack content overview.
Merge branch 'master' of https://github.com/academic-colab/maslo-editor

Conflicts:
	source/js/manifest.js
master.sh now updates automation scripts
Make things work for local deployment
Add an option to allow remote preview
Fix image links
added google-api-services-tasks to pom.xml
some what working nDoc module

The proof of concept seems to work great.
Adding automatic ssh handling setup, if available
Merge branch 'master' of github.com:ajcrites/.explosion-pillsrc
A couple small updates for git/ssh

bash_ssh didn't work out to well, so I had to come up with a different approach (that wouldn't make sense with the rc files since it's all per-server
Also added a couple small git aliases
Merge branch 'master' of github.com:ajcrites/.explosion-pillsrc
Improving defect regex for server name match
removed default .entry-content horizontal padding so it doesn't interfere with fluid layouts, added html5 tags to page.php
Merge
Remove guage plugin
Add in a jgauge plugin
Create new index and analyze pages
Adjusting Maven Release Plugin
create new Configuration only if it doesn't exist
admin minutiae to get clean wd
add padding to how it works text
Added Form Partial _form.html.erb
LPS-28821 Send message for Marketplace LPKGs deploying
LPS-28821 Source formatting
LPS-28832
LPS-28763
Updating Alloy to f2c75aa; LPS-28457
Regenerate
Javadocs
LPS-28845 Add handling for getBoolean
LPS-28845 Source formatting
LPS-27258 PortletPreferencesListener should do a merge update for Layout
LPS-28369 Set LDAP connection pool parameters by using system properties
LPS-28639 Source formatting
LPS-28639 Source formatting
LPS-28639 Source formatting
LPS-28494 DefaultScreenGenerator replaces all digits by dots when
creating user screen name
LPS-28494 Source formatting
LPS-28494 Source formatting
LPS-28830
LPS-28830 Fix it everywhere
LPS-28782
Safetyping NULL
added bootstrap UI
CLOUDSTACK-771:Instance Table misalignment : Adding the hover view in order to display the full text
repack jar to make it executable (for test purpose)
add ant build.xml for packing into executable jar
downgrade jna version from 3.4.0 to 3.2.7 which support older glibc
update .gitignore
compatible with 1.5 (remove @overrides)
AFClient Error Handling
rpmbuild in makefile
%prep corrected: %setup -q
ChangeLog name
spec_file var
libargus-pep.so.2.0.4
correct rpmlint W: unstripped-binary-or-object
make distclean updated.
added a clean-local target (cleaner ;)
tar.gz moved to src.tar.gz
correct rpmlint E: explicit-lib-dependency libcurl
clean delete src.tar.gz
doc updated for RPM package.
Confusing use of !

Remove some of the confusing use of '!' listed in #23
Some of them are not confusing and should be probaly kept
Expected something and saw something else

This fixes #30
FormatFactory is now deprecated as it's not needed anymore
Unescaped symbol

Fixes #31
Literal in parens

Fixes #32
Unexpected escape

Fixes #34
Merge pull request #130 from piuccio/jshint

Fix some of the Jshint errors
Quick fix for IE8 radio button blur issue.
Adding w3m browse url as the default browse-url-browser-function.
small simplification
Merge pull request #3 from etorreborre/patch-1

small simplification
[maven-release-plugin] prepare release atlassian-bamboo-plugin-git-1.8.20.BDEV528.5
xml date fix
fixing fixing fixing....
Added a few appropriate references, fixes.
multithread_plugin.c: add missing definitions for systems without poll.h

Change-Id: I43cbf61ac8fb6abd5051bece190eb2a330e59f3c
RCBC-70 return binary keys using Encoding.external value

Prior to ruby 1.9 strings didn't have an encoding (afaik) so it didn't
matter. Encoding support was added in 1.9.x and strings created by ruby
extensions must have a default encoding which is ASCII-8BIT. In
addition the Encoding.default_external value now exists and it's
automagically set based on Ruby's environment or parameters. Within
ruby extensions though, rb_str_new() doesn't care and uses ASCII-8BIT.
So, for new ruby extension that does stuff which creates strings for
ruby you should really be using rb_*_str_new and friends.

Another important note (aka, why this matters) is that Encoding::BINARY
is ASCII-8BIT. This basically means that each byte (8 bits) is a
character. So, in UTF-8 "abc" is 3 characters and 3 bytes whereas
"\u{1f4a5}" is 1 character and 4 bytes. If "\u{1f4a5}" is processed as
ascii-8bit it could mistakenly be processed as 4 characters.

Some useful links:
http://yugui.jp/articles/838
http://www.ruby-forum.com/topic/203865

Change-Id: Ifeba110df417c359c1f6bd0540223d72f2b56dc3
Reviewed-on: http://review.couchbase.org/19405
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Switch to rbenv because RVM doesn't work with tclsh

Change-Id: Ic9061159b20879538107b9872f07b158a95c5daa
Reviewed-on: http://review.couchbase.org/19406
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>
[backport] RCBC-37 Bootstrapping using multiple nodes

Change-Id: I99c3dfef42830e8ce34f155945d28b47ad4432d8
Reviewed-on: http://review.couchbase.org/19411
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Chris Anderson <jchris@couchbase.com>
Bump version 1.1.4

Change-Id: If8f193e1c7fdeb03cd3c27258d97c17e3390f45f
Reviewed-on: http://review.couchbase.org/20335
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Merge branch 'release11'

* release11:
  Bump version 1.1.4
  [backport] RCBC-37 Bootstrapping using multiple nodes
  Switch to rbenv because RVM doesn't work with tclsh
  RCBC-70 return binary keys using Encoding.external value

Conflicts:
	HISTORY.markdown
	ext/couchbase_ext/couchbase_ext.c
	lib/couchbase/version.rb
	tasks/compile.rake

Change-Id: Id90c7a9176ba811701210f51a19fbf3441a5033a
Change ES node instantiation
Testing...
Merge remote-tracking branch 'origin/master'
Added hashbang.
Exam Variants
added include of feature2d.hpp
Fixed tar releases
made all kinds of changes reflecting the double cancellation upgrade.
Update ext3 and ext4
Update files to unix format

Conflicts:

	drivers/star/ts0710mux/ts0710_mux_p999.c

Signed-off-by: Harsh Bhanvadia <harsh.slade@gmail.com>
Add voodoo, update battery driver etc...
Remove unused
GB P990 Test config
USB: HOST/OTG
Driver: fixes
Kernel config update

For USB/OTG
and removed pmem
tegra: timer code fix & NVIDIA tegra fixup
Core and CPU voltage reliability requirements for some skus (from LG)
fixed the client size in IE
Merge pull request #67 from capilkey/fix-ie-client-size

fixed the client size in IE
Fix for issue http://code.google.com/p/bigbluebutton/issues/detail?id=1294
bbb-lti 0.1: BigBlueButton LTI interface, Initial commit
Signed-off-by: jfederico <jesus@123it.ca>
insert the scroll bar on the chat automatically instead of grow the div indefinitely; little improvement on the deploy script for the recordings
bbb-lti v0.1: First working version.
Users can join BBB meetings using LTI links. All users login as moderators though
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Joins can be differetiated by the role in the LMS
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Welcome message is generated using the resource title
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Default welcome message is localized to English, Spanish and French
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Replaced hardcoded url and salt parameters by configurable ones
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti 0.1: Renamed bigbluebuuton api class
Signed-off-by: jfederico <jesus@123it.ca>
Cleaned up debug messages and made ltiEndPoint configurable
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Made "consumers" parameter configurable
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Cleaned up code and added README file
Signed-off-by: jfederico <jesus@123it.ca>
bbb-lti v0.1: Refactoring to get arround a problem with the LTI Sakai implementation
Signed-off-by: jfederico <jesus@123it.ca>
Merge pull request #69 from jfederico/master

Good work Jesus
bbb-lti v0.1: Fixed a problem with localization and cleaned some debug messages up
Signed-off-by: jfederico <jesus@123it.ca>
Merge branch 'master' of git://github.com/bigbluebutton/bigbluebutton
Merge pull request #70 from mconf/master

Few improvements related to the record and playback
bbb-lti v0.1: Added createTime and userID parameters to the join. Added metadata for monitoring
Signed-off-by: jfederico <jesus@123it.ca>
Merge pull request #71 from jfederico/master

Few fixes for the bbb-lti module
Merge branch 'master' into modify-chat-to-use-consolidated-users
 - change advancing to next chat message for accessibility from Key 32 (space) to Shift-Alt-32. The
   reason is that we need to listen for keystroke and trap the ENTER key when we allowed input of
   text in several line by converting to TextArea from TextField.
change from proof reading of Ballon manager docs

Fixes bug: 3352
Merge pull request #14 from boegel/develop

fix typo
add UGent in copyright header
Merge pull request #15 from boegel/copyright_UGent

add UGent in copyright header
Recurring transaction.
More testing
Merge branch 'master' of github.com:bootstrapworld/wescheme2012
Added missing ko method : "cleanNode"
Merge pull request #104 from BreeeZe/master

Added "cleanNode" to Knockout
nitrogen6x: increase console buffer size to 1024
Added support for MG4J models
Added save button icon.
Started DB testing development
<link rel=canonical> is now interpreted as an origlink
Executor and data skeletons.
Merge branch 'master' of ssh://git@github.com:22/burnersk/BukkitPluginPlayed.git
journal background image style + img into separate style sheet
proper handling of buffers with more than one response
New Sample Launcher Activity
Change Sample package name as someone is using this one on Google Play
Add link to Google Play app from README
Google Play link to use Markdown
Add AppBrain SDK Widget
Revert "Add AppBrain SDK Widget"

This reverts commit 04e354a896c143abd10d62963bc72560f43a6875.
Merge remote-tracking branch 'github/master'
remove *.iml files
Merge pull request #7 from chance-an/Xin-lu

remove *.iml files
Added try...catch to calculator.createChart().
去除一些智能算法依赖
Bugfix in PLaSM.
Splitting Plasm textbook.
Continue splitting Plasm
re-adding changes
corrected code spacing
Added Customer/Inventory relationships
Added modifier for routes
switched to factorygirl
removed old controller specs
fixed adding to cart bug
Added link to Google Scholar.
IMP mne_experiment: retain ._root attribute
ENH mne-experiment.iter_temp(): allow constants
cleanup
FIX: "chain" arg renamed to "tile"
MOD: merge .iter_path() into .iter_temp()
added trees not added also
started implementing "restart server" functionnality (not working...)
sync ebuild updates

merged:

  cbl: 2b9acf41fecbd367465dfac1c40139d825e37bfb
  cb-ports: 8f63a15fd025282d320b8bb82a9c07f9bd9b0edc
add django proj
sligh adjustments to design in accounts
move the subscribe button to sidebar
change button colors, adjust tab styling and header colors
make the login popover smaller
make tabs smaller
change background colors in dropdown in stats page
adjust fonts
Merge branch 'development' of github.com:codeforamerica/blightstatus into development
merge with development
Implémentation overriding du cleanup du plan d'intégration
Add close statement on DeleteHandler.
Improve screenlet's content tree test coverage...
add note about Chameleon's pinning
Testing twitter and linkedin buttons
Removing 'expandtab' from vim modeline

Per discussion in #libcouchbase, removing expandtab from the vim
modeline.  Inserting literal tabs (i.e. via the "noet" setting
here) is the desired state to comply with PECL coding standards.

Change-Id: Ia87e78bc9274142bf7f7102f75445f2bbff9dabd
Reviewed-on: http://review.couchbase.org/20746
Reviewed-by: Sergey Avseyev <sergey.avseyev@gmail.com>
Reviewed-by: Mordechai Nunberg <mnunberg@haskalah.org>
Tested-by: Mordechai Nunberg <mnunberg@haskalah.org>
Reviewed-on: http://review.couchbase.org/20872
Tested-by: Sergey Avseyev <sergey.avseyev@gmail.com>
right scroll fixes for chrome
Enhance javadocs and fix code analysis warning
updated kurtosis to work with current path and to use lmrob
Add PANAS to the total model
added submit button validation
Minor tweaks - move testsettings into top level, update tox for Django 1.4, include author_email in setup.py
Merge
Made Align Orientation settings persistent
remove outer element and add border instead
tweaks to the event processor registrations.
Fixed reference to controller
Reading of settings is always done relative to the virtual directory, and not to the http request fragment
Merge pull request #246 from danielkzu/245

Updated database initializer project so that it's a bit smarter 
Updated registration-side DTOs so they contain seat type total seats too.
Simplified CRUD conf. admin BC so that it doesn't do diff of quantities (just create/update of seats).
Updated ConferenceViewModelGenerator to send commands to add/remove seats that are handled by the SeatAvailabilityHandler.
#236
Updated database script for new property on the seat dto.
Fixed the error generator to optianally use a session variable, stage 4 main template defined
kill questionable patch
cups-filters now deps on libqpdf
add build recipe for installation-report
fix libsynthesis recipe
kill unrecognized --enable-pulse
hail mary commit
pkgconfig is arch-dependent in ecore
dep on btrfs-tools-udeb
got the system dataserver working
Shells out new state tests.
Asserts Interval
Fixed typo in install.xml - thanks to Geoffrey Rowland
Copy submission scripts to binary dir
connected to sql, modified hsserver.c
Update for Calendar app

- One label is randomly assigned for each course to be used for all
calendar events for that course
- Fixed the models up a bit