labofsahil/github-event-dataset-2012 huggingface dataset:
Uploaded new WebRTC content for Learning Lab 2.
Added proper link for the hackable demo to the resources file.
Also changed the title on some link nodes (also in the resources file) to fit better.
Added Hackable Demo URL.
Changed Video URLs to those provided by Ben.
Adding in a new resource for the webrtc learning lab
Merge pull request #112 from rossbruniges/dev

New webRTC learning lab
Adding in support for 'sticky' posts
Merge pull request #113 from rossbruniges/dev

Adding in support for 'sticky' posts
40 lashes for checking in a console.log
Merge pull request #114 from rossbruniges/dev

40 lashes for checking in a console.log
Removing WebTrends - adding in Google analytics
Merge pull request #115 from rossbruniges/dev

Removing WebTrends - adding in Google analytics
Merge pull request #116 from mozilla/dev

Merging up the new webRTC page from dev
Merge in from staging
Merge pull request #118 from rossbruniges/master

Adding in new webRTC learning lab
Removed Mongo versions
Changed project layout, removed java specific view files
implemeted dynamic bg
More stop words added.
remove import subcommands
update ChangeLog for 2.0.7
Added support for autoreconf
Added auto-destroy on DOM remove
fix LNK2005 and LNK2001
change PROBs for debugging
mutate 3 times for debugging
Merge remote-tracking branch 'origin/master'
add filtering to persistence
add documentresource index, fix memorypersistence
comments and stuff
add jsonschema
use 422 for validation errors, use message in errors
add persistence skip/limit
add pagination
move main actions to on_left_click
made sanction Event separate thread
Merge branch 'master' of https://github.com/mzaccardo/EfficienTime.git

Conflicts:
	src/com/aetherworks/efficientime/server/EfficienTimeDaemon.java
added south in heroku requirements file
add disponibilidad to voluntario alta form
Merge pull request #1 from narutkowski/master

second test
first question answered
second question answered
third question answered
fourth question answered
question 5 answered
5
added mark complete ability
adding ability to wait for an element to become invisible
Add value axis and AmCharts\Graph\Fields class
actualizacao terminar()
Editing attributes view
fix for 8570946
Manage: merge add addon form & edit addon form temlate
Manage: addon form replace preProcess by getValues
Manage: replace addon forms with factories
Manage: addon form description format now as radio list
adding links to new deployment destinations
adding new pages
updating links between sub pages
Fixing the 'Chrome steals focus bug (https://github.com/emposha/FCBKcomplete/issues/107)
[NGRINDER-286]Share user identity to other users.
add table “shared_user” saved user and its share users relation
[NGRINDER-80] Fix the defect in which the user profile is not changed 
- Fix the permission denial.. to modify the user profile in the user
permission
[NGRINDER-72] Add ngrinder agent download 
- For download... single jar packaging should be copied to
ngrinder-controller from ngrinder-core.
- Add this pom script.
Merge branch 'master' of https://github.com/nhnopensource/ngrinder.git
[NGRINDER-72] Add ngrinder agent download 
- it's just merge.
[NGRINDER-29] add user login plugin module 
- Make plugin scan faster
adding mask rasterizer dir since scons gives linking issues


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48943 954f8c5b-7b00-dc11-b283-0030488c597c
Minor UI message fixes.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@48057 954f8c5b-7b00-dc11-b283-0030488c597c
move mouse select options into their own property function - more operators should use these eventually

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47103 954f8c5b-7b00-dc11-b283-0030488c597c
UI fixes for Laplacian Smooth (r51578):
* Make UI look more like Smooth Modifier.
* Don't use RNA property names like "lamb", use a more descriptive one instead.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@51580 954f8c5b-7b00-dc11-b283-0030488c597c
Import the RangeTree library into extern

RangeTree is a simple C++ tree set for storing non-overlapping scalar
ranges. Original source from:
https://github.com/nicholasbishop/RangeTree

Also update the build systems to include RangeTree.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53431 954f8c5b-7b00-dc11-b283-0030488c597c
Add BM_edge_calc_squared_length() query function

Same as BM_edge_calc_length(), but avoids square root for cases where
only comparison is needed.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53432 954f8c5b-7b00-dc11-b283-0030488c597c
Add function to find closest point in triangle to another point

New function is closest_to_tri_v3() in BLI_math_geom.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53433 954f8c5b-7b00-dc11-b283-0030488c597c
Disable fall through to global undo from paint/sculpt undo

Undoing/redoing in sculpt and other paint modes should only use the
mode-specific undo, not global undo. It is now consistent with edit
mode and avoids tricky interaction between the two systems.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53434 954f8c5b-7b00-dc11-b283-0030488c597c
Add BMLog for efficiently storing changes to vertices and faces

The BMLog is an interface for storing undo/redo steps as a BMesh is
modified. It only stores changes to the BMesh, not full copies.

Currently it supports the following types of changes:
- Adding and removing vertices
- Adding and removing faces
- Moving vertices
- Setting vertex paint-mask values
- Setting vertex hflags

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53435 954f8c5b-7b00-dc11-b283-0030488c597c
Add GPU_buffers support for drawing dynamic topology nodes

The GPU interface for PBVH drawing gets a new pair of build/update
buffers functions for drawing BMFaces and BMVerts.

TODO: the diffuse color is hardcoded to 0.8 gray rather than using
material color.

TODO: only VBO drawing is implemented, no immediate mode.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@53436 954f8c5b-7b00-dc11-b283-0030488c597c
Fix navmesh after recent bmsh api changes.

git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@52665 954f8c5b-7b00-dc11-b283-0030488c597c
quiet warning


git-svn-id: https://svn.blender.org/svnroot/bf-blender/trunk/blender@47704 954f8c5b-7b00-dc11-b283-0030488c597c
fix typo in sbuild --no-log change
section 3.2 and 3.3 modified
Changed error handling: display only the beginning of an error when it is too long
Merge branch 'master' of github.com:ning/killbill-admin-ui
got the sorting by day thing nailed
warning cleanup (don't care about unused zhelper stuff)
test01 file added
Xeno creature
Remove inploy gem
Scoping out clerk bosses is not a good idea, given the seed data
Make data in grids sorted by id by default
A note on PgGridTweaks
Update the caching rules for css and js
Implements plan and period information + timestamps
Fixed bug in target-counting
set up directories and app.js for the expess app
Merge branch 'master' of https://github.com/ntkachov/CS320-Project
Updated project to use spaces.
Updated NLFoundation framework to support armv7s architecture.
Move repo field up into GitObject
Fixed the little dirt on the status line
added hole filler
hole filling improvements
0071
added hole filler
fixed for drawing dof clouds
get rgbd and removed shader from here
capture gui refactor
major push in recorder functionality
bug fixes and rendering updates, some small features
update for ScreenLab opening refactor
Update for windows test
adding render settings
shader refactor
Projective Texturing work
no outlines
renderer reindexing
updates from windows machine
user changed flagging
recorder updates
Merge remote-tracking branch 'origin/develop-0071'
Site updated at 2012-09-03 08:09:33 UTC
css and visual updates to presentations
mingw defines cygwin32 as a host OS.
Fix IOC diagnostic with a left shift.
Added test for issue 2896
Update notes for submitted changes

* Add quantum files for apts + rpms
Update notes for submitted changes

* kill throws an error while finding pid in quantum dhcp agent section
Update notes for submitted changes

* Name the tgt/conf.d enties based on the vg name
Name the tgt/conf.d enties based on the vg name

On one system multiple volume and volume manger could be installed and
needs dedicated tgt config entries.
cinder-volumes, stack-volumes, nova-volumes are the default volume group
names.
/etc/tgt/conf.d/ files should be named based on the volume-group name.
The vg name is uniq on one system.
In devstack case the stack.conf is usable.

Changes:
* Rename conf.d/cinder.conf to conf.d/stack.conf
* Handle conf.d similary on all distribution

Change-Id: I856cdf4a21a414d2940d8f9d8b0b0368b1fad887
Merge "Name the tgt/conf.d enties based on the vg name"
filters v2 begin
auto_html into manage for trailer
стемминг на основе hunspell
support for ngram indexes
change quotes to apostrophes
codemirror is in media
Added bootstrap css; remodeled skin a little
Revert "Add ported user documentation (from CGI)."

This belongs into stable45 first.
This reverts commit fca8b245b7e991f59af449496b450d92c9311754.
Cut a VM with a working browserid run_locally
Added Elastic Slide Plugin , not integrated still
Removing old debug statement
Paul | Updated theme switcher, removed hard-coded time delays ; Setting cookie when theme is switched;  reading cookie to set theme and on state of theme switcher buttons after page loads (need to make this less wonky so theme and button are set as the page is loading, not after).
improved POD
added important search option
added WebDF files
updated to Ver.0.00_8
Alphabetized the modules list.
ea
merge fixed
modified:   ../../env/.aspell.en.prepl
modified:   ../../env/.aspell.en.pws
modified:   modernOpticsProblemSet1.tex
Add test for update_status method of UserRequest
spinner ext: fixed default style
move count down logic to GLUEventHandler
only README change
"game over" is shown after all animations finish
finish chapter 5
rm some files to merger
ch7
added markdown icon
added xmpp, html5 and css3 icons and doku
Limp
BLGLJOIJO
Wat?
DERRR?
Linuxy split pane tmux'
Locale bugs fixed
fix typo in Canfield rules
add cacheNode method
use Solitaire.Util.cacheNode
display the foundation seed in games that is it
add seedRank method
display the seed rank for games that use it
add mapRank method
load DisplaySeedValue module
use seedRank method from Util
style the rank value node
load display-rank-value.js
update build
Merge branch 'master' of github.com:pharrington/Solitairey
Removed sqlaccess and added Silex framework and index.php
Added index.php and silex framework, deleted sql_access*
Commiting from the command line
Added a bit more to the beers page
good stopping point
Big Push, no agile development :/
Updated _posts/articles/2012-08-15-your-filename.md
Lets try this with solr
New integrated styles demo.
Merge branch 'feature/styles-demo' of git://github.com/prototech/customisation-db.git
Site updated at 2012-04-03 21:35:57 UTC
Moved function to menu.js
Clickpaths
Clickpaths w/ keywordsearch
Reduced interface to five handle methods.
Remove bogus links from project tiles

- When refreshing a project tile, it would get back a link to the
  project tile partial if there were no project statuses. This has been
  removed.
Improve where project heading link goes

- Status url points to the latest build or the index of builds where
  possible.
Slightly modified MonteCarlo
touch
Merge branch 'master' of github.com:pkarasev3/chernobylite
sync
Take the mozilla license.
Take the dropbox code from domacs.
Ignore dropbox ini file.
Remove webpy stuff.
Update dropbox version.
Make dropbox_folder a package.
Synchronize a test folder.
Add changes from 4.2
Move some packages out of 'test fixes only' since they have real fixes.
Description added.
Copy last successful build from plone-4.2-tests job and run a nightly test coverage on all Plone tests.
disable search rss head link also
Modal's title could be set with the content of modal

a js put element with custom attribute in modal's header
Modal's title could be set with the content of modal

dedicated js
Merge pull request #40 from srogier/modal-title

Modal's title could be set with the content of modal
Renamed copy of test_readProcessStdoutLog_badargs to test_readProcessStderrLog_badargs

test_readProcessStdoutLog_badargs test function name was duplicated... therefore only one was being executed... I renamed the second occurrence to test_readProcessStderrLog_badargs so both functions are now running alright...
spell check much?
Revert "spell check much?"

This reverts commit dde3a1bb775a7186cea0d09d618b60d996a5bebd.
added proper spell checking
Added about me pic
Add # in front of hashtags
created both views, set up connection, and set up keyboard
separate array wrapping and NodeList freezing
rearrange code a little
remove a dead code path (used by directives)
less aggressive normalization of html in specs
clean up the spec output message
big rewrite

* now array clones current node, not childNodes
* clean up specs
* breadth-first element search with bailout on first match
* remove caching of element lookup
* set content regardless of current value
* fix bug with filling value attribute on option tags
* don't use `listElement` class for lists
bulk rename org.mitre.hdata.test -> org.mitre.test
relocated package
moved location
update java class to new package
update package
Added an installation script for Cypress on Ubuntu 12.04.
(cherry picked from commit 48b4d8f48f185752ecfbd293f949f9c5f561da60)
[Command] Prevent error if no password found
bombenradius variabel vom player gemacht
added some basic editor-related stuff
Versuch BomberManMove und Spielfeld zu verbinden
Laden modifiziert. Soweit funktionstüchtig (nur Einzelspieler).
Merge branch 'master' of github.com:propra12-orga/gruppe13
Reset des Feldes bei neuem Spielstart
zerstörfunktion neu
menueleite
client malt das Level
client malt Level noch besser, aber schliessen von Verbindungen funktioniert noch nicht
Merge branch 'master' of github.com:propra12-orga/gruppe35
Konflikte beseitigt
Corrected encoding.
Increase font size on labels
Skin ultima penso
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
add qtest2
Merge pull request #187 from vincent-hugot/master

add package for qtest
Update lwt-zmq to a stable version
Update tryocaml to a version which works
rpc 1.3.0 needs js_of_ocaml of the client part
Add missing META file for xml-light (from GODI's repository)
[update] sqlite 2.0.3
add yojson-1.1.3 update
Merge pull request #189 from hhugo/master

update sqlite3 to the latest tagged version
add native dynlink to osx
Merge pull request #190 from hhugo/master

3.12.1 with native dynlink for darwin >= 10
add xtmpl 0.4
add stog 0.4
fix dir name for stog 0.4
add stog.install
fix md5for stog
Merge pull request #191 from zoggy/master

Adding xtmpl 0.4 and stog 0.4
Fix qtest description file
connect.2012.5 added
SOC-0004 | Using Spring IOC
Extract namespaces, classes and members for each namespace used
added i18n for will_paginate
underground region -> [feature] layer, site building -> structure; also fix some fields from XML dump info
Removed compiled JS from repo
Integrated wikid stylz
update new code
Commit
Commit
Update multilanguage
Add some things to relatorio.tex.
Added config file sanity checks
sql2 has own model to inject sqls array into tmeplate
tidied repository
Fixed ordering styles
Update link to puzzles page
Keep on fixin'… (double height)
code cleanup + bugfix
Updated README format error
Config page is loosing fitnesse host on edit

Following commit f7aea0e7c7573e511fe2e399daa480d7e9d5bf58, whenever the config page is opened, the fitnesse host field is emptied. This commit fixes the problem by reintroducing the getFitnesseHost() method used inside config.jelly
style me pretty

various style changes
add info['image'] to raw_info['avatar_url']
Merge pull request #6 from kuboon/patch-1

add info['image'] to raw_info['avatar_url']
Merge pull request #9 from rdsoze/master

added test cases
use private email address if public is empty
Merge pull request #10 from benoist/master

use private email address if public is empty
Bumps omniauth-oauth2 dep for security concerns. Bumps version to 1.0.2
Fix a few issues and enforce PHP 5.3 in the installation.
Remove PHP < 5.3 checks
Small checkToken() fix, needs to go into the CMS!
We need the platforms legacy mode for the CMS.
Fix to be upstreamed to the platform.
Fix new strict warnings.
wibble
Fix running tests for test host that crashes before starting a test suite
testing more changes and some directory modifications
Breadcrumb: Memperbaiki masalah paddng pada ul#crumbs
modify match model to suit new fetch api
grunt.js cosmetics
build_string() on steroids
ok tweets y linkedin cajas
Adds validation of rule to RuleSet
Disables customising rules on create. Customising is now only available in edit
Initial setup
Merge branch 'master' of github.com:reggieb/event_calendar
fix minargs
Fix potential use of NULL pointer in printf %s

Import $.x from an ecl file submitted to eclcc could use NULL as the module
name in the error text (see example).  It could only happen if $ was the
module (otherwise it would have matched a name), so use "$" instead.

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>
Fix dllsToSlaves option

If the Thor configuration option dllsToSlaves was switched off (default on),
slaves failed to load the query from master.

Signed-off-by: Jake Smith <jake.smith@lexisnexis.com>
Fix gh-2393 Error on keyed child index
Merge pull request #2590 from ghalliday/badimport

Fix potential use of NULL pointer in printf %s

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #2606 from rengolin/intindex

Fix gh-2393 Error on keyed child index

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #2592 from jakesmith/dllsToSlaves-fix

Fix dllsToSlaves option

Reviewed-By: Gavin Halliday <gavin.halliday@lexisnexis.com>
Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Fix gh-2610
Merge pull request #2625 from rengolin/tests

Fix gh-2610

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Remove unused port argument
Remove port from renamePhysucal, too
Merge pull request #2659 from richardkchapman/roxie-nodes-gh-2656

Fix gh-2656 thorlib.nodes() always returns 1 on Roxie

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Fix gh-2660 CATCH,SKIP in Roxie not aborting upstream activities

Minor refinement to previous fix based on code review.

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #2655 from richardkchapman/library-tests-hthor

Fix gh-2654 Skip library tests in hthor regression suite

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #2658 from richardkchapman/remote-test-gh-2624

Fix gh-2624 remote.ecl mismatch test in Roxie regression suite

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Merge pull request #2657 from rengolin/regression

More output to library2a.ecl

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Add OSX build section to README

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #2589 from RussWhitehead/setResult

Fix gh-2202 Incorrect output from xml output(row)

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Corrections based on code review of richardkchapman and jakesmith.

Removed user passable chunkSize.
Moved check if file is readable.
Cleaned up style issues.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
changed loop to no longer worry about a file under the chunkSize as it is handled in read.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Adding missing reserve of space for memorybuffer.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Moved chunksize to a define.

Signed-off-by: Philip Schwartz <philip.schwartz@lexisnexis.com>
Merge pull request #2601 from garonsky/issue-2387_give_hint_of_active_xml

Fix gh-2387 configmgr - Give indication of staged configuration

Reviewed-By: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #2663 from richardkchapman/readme-mac

Add OSX build section to README

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Fix for pull request #2593
- Fix for center context menu not accepting clicks

Signed-off-by: Gleb Aronsky <gleb.aronsky@lexisnexis.com>
Mac Installer Tweaks

Improved display messages.
Fixed "usage" size information.
Generalised known executable list.
Add version information to client tools install folder.
Only fixes rpath for "make install" and "make package"

Signed-off-by: Gordon Smith <gordon.smith@lexisnexis.com>
Add new test case to verify catch behaviour with splitters

Signed-off-by: Richard Chapman <rchapman@hpccsystems.com>
Merge pull request #2661 from richardkchapman/roxie-catch-skip-gh-2660

Fix gh-2660 CATCH,SKIP in Roxie not aborting upstream activities

Reviewed-by: Gavin Halliday <ghalliday@hpccsystems.com>
Skip library2a in hthor
Mark when* TBD in thor
Old Thor shouldn't have TBDs
Check CONTINU==0 instead of CONTINUE!=1. If any error occurs with zenity, installation would stop
Add support for moving the call+pop sequence that is used on 32 bits
to extract the value of eip.
Add testing for clang and x86_64.
Merge branch 'extract-eip' of https://github.com/espindola/mach_override into unstable
Remove table code in favour of bootstraps
fix app ruby-mode snippet
Easy fix while debugging.
run.lua: Fix the trailing slash problem.  This has bugged for me a while :-)
Oops.
Oops (2)
Cleanup.
GNU/Linux Distributions
special script to reduce D-array saturn data
de-fixing this cause it doesnt work, fix this!
rake is a dev dependency
add pagination to vod#edit
move 2 config file from prebuilt to vendor
Fixed postgresql driver version
Changed implementation of the remote validation to allow it to work with older versions of jquery
remove readlink call and clean up
Merge pull request #1173 from walkah/virtualenvwrapper-osx-fix

Readlink is different on OS X
Add sane aliases for killing processes.
Before trying a simple optimisation.
Support for colorgcc
ADC in burst mode works.
Cleanup for merge and feature finish.
0.0.8

Added skinning setup for scene2D.
bdd fix
updated README.md TODOs
Replace color
Verbiage updates

Signed-off-by: Rogie King <hug@rog.ie>
Added Offline Access Slide
Added filtering of trashed files
Added persistence and read only api
Lessons building mongoengine is a go
Updated nginx post - after comment
Merge branch 'source' of github.com:rozza/rozza.github.com into source
add ZoomOut button
added earth with bump mapping
Update README to note interaction with RDFa.
Remove dead code

Previous to this commit, a local variable was instantiated without
side effects by the looks of it, but never used. As a wild guess, this
code was orphaned by a refactor that moved subsequent code to a
separate method that recreates the same local variable. If this isn't
dead code, then it should be refactored to make more explicit what is
going on.
Merge pull request #97 from lifton/refactor/master/remove-dead-code

Remove dead code from LDAP authenticator
remove sigfrid
switch to latin modern typewriter, use octal escape codes
Add test for bin script
Replace IPC::Open2 with system() to keep win32 from hanging

Windows seems to hang waiting for more <STDIN>...
No idea why.
We'll see how portable this is.

See also https://gist.github.com/2559702
Site updated at 2012-11-07 09:32:46 UTC
Site updated at 2012-10-03 18:02:15 UTC
20120616H
update MCC page
Update WOSN page
Fixes format in README
Improved readability of comments and long lines
Removing stale pathogen.vim

Since I've updated my vimrc to source from the vim-pathogen submodule, I
no longer need a symlinked pathogen.vim in autoload/.
Feeble attempt at supporting COLLADA's matrix transforms

Signed-off-by: Casey Dahlin <cdahlin@redhat.com>
Add a smaller cube reference model

Signed-off-by: Casey Dahlin <cdahlin@redhat.com>
Make reference cube a collada file

The new small reference cube model we added is now as good as the hardcoded
one, so we replace one with the other.

Signed-off-by: Casey Dahlin <cdahlin@redhat.com>
Merge branch 'master' of https://github.com/sadmac7000/luftballons
Revert "Merge branch 'master' of https://github.com/sadmac7000/luftballons"

This reverts commit afa51ead42734bfcf85d286a3c3f173a372ad91a, reversing
changes made to 9fdd0f7953390260fafd2cc38cd0b2da5f5ee4e0.
KNL-985 - Revert KNL-734 from 2.9.x, change datatype for Oracle for KNL-725


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@115398 66ffb92e-73f9-0310-93c1-f5514f145a0a
update and clean
new post: MetroIRC
move words txt to relevant folder and rename path
markdown extension for rule book
[MNT] Minor refactoring and faster interaction
automatic sidebar generation
first commit
Merge branch 'master' of github.com:sasha237/VideoAnalyser
Format ruby codes
Removing bad migrate causing database rake to crash
Added tests for valid and invalid signups
Finish sign in
Merge branch 'sign-in-out'

Conflicts:
	app/views/layouts/_header.html.erb
Finish user edit, update, index, and destroy actions
Sixth Test Case Written
license update and new header: pdftotext.h
iaero
add num cap validation, checkbox validation
Merge branch 'master' of github.com:scottusrobus/aristotle
Took out admin requirement for destroy
Started Tumblr integration.
as a matter of style, replaced realloc with reallocf, to prevent memory leak
enabled more warnings, again only available in newer Xcodes, but harmless in older ones
geclogo git repo renamed
CharacterArray>>isDigit CharacterArray>>isLetter Symbol>>isUnary Symbol>>isKeyword Symbol>>precedence Collection>>occurrencesOf:
Fix some NPEs in TableIndicator for MS1
Merge pull request #111 from sebgiroux/master

Persist gaugeEditEnabled flag on device rotation + Fix Dave's bad merge :P 
Fix for getting a page of tachos on reconnect
Merge branch 'master' of github.com:scudderfish/MSLoggerBase
Add status notification and icon in status bar
Fix bug in burning page (wrong table index) + remove useless import + add more debug when crc32 mismatch
Support for new MS3 ini section ControllerCommands + Added support for MS3 pre1.1 alpha 2 + ini typo fixes
configured htmlmin
MapWrapperの要素型をMap.EntryからTuple2に変更
Wrapper関係クラスにzipメソッド追加
More batched bits and fixed ceiling collisions
Changed the name from Spree::Gateway::Samurai to SamuraiFighter in order to prevent naming clashes with the Samurai module used by the payment library
modify pic width
condensed, more efficient problem 49
exportando db
Changing game to lowercase

on site it links to uppercase G
sqlite3 fix trial #3
- [enhancement] vector<T> indentation
- [added] greed signature
- [added] greed version number on UI
- [updated] code comment
small stuff
Merge branch 'master' of https://github.com/si649/wildlife-strikes
Added Twitter Bootstrap along with Homepage view
Added new homepage view page
Added font awsome icons
Updated font awsome location and added social login buttons
refactored the way create game works,  no more radio buttons
updated players to have current turn
removed cascades from story on game
story create screen formating and adding a max player field
added validation to step one of the story creator
more validation on story create and better step headings
MenuFix
Merge branch 'master' of https://github.com/silas-h/themaopdracht5
Second TODO (redondance de infos)
+ nettoyage des TODO
modified the mapping and found a way to boos the title and description field
Added requirement for pyes
Reworked mapping
Merge remote-tracking branch 'origin/boosted_search'

Conflicts:
	app.py
	dump_in_es.py
Description and Title fields now use snowball analyzer; Added indexing of Categories
Fixing Issue 48: Error when calling .transition() in IE 10
-added mirror board
Reworked to be hash-agnostic

  Perl moved the Digest module into the core, so we'll load
 one of Digest::SHA or Digest::SHA1 dynamically.

  This avoids pulling in libdigest-sha1-perl when it isn't
 necessary.
Readme.md ajouté
add multi-ship map and example-multi script
Added about Carrillo Page Pics to slider
merge develop --exclude conflict needs-fixes broken: PR 17 (Figure scripts tiff 10000 develop)
merge develop --exclude conflict needs-fixes broken

Repository: ome/scripts
Updating 457e85a..80884ad
Merged PRs:
  # PR 17 jburel 'Figure scripts tiff 10000 develop'

Generated by SCC-merge#71 (http://hudson.openmicroscopy.org.uk/job/SCC-merge/71/)
Added brevity.rkt
Removendo eventos do sidebar, link para o grupo do facebook
A optimization for new snippet action,used in the following scene:

1. recently entered the code suitable for use as snippets
2. select code
3. C-c & C-n to add new snippet
4. new snippet's buffer contain those code
5. modify and save new snippet
fix ByteBuffer is not sent all
- indicate characters left, refuse characters when 0 left
new method encode for Packet class
unfinished version of decode using split. probably better to use regex
Merge remote-tracking branch 'sebastibe/master'
finished up the packet parsing and got the server actually running
NR-536 : On post insert with publish time set the order is not set
Updated egg info
Removing an unnecessary Node#key? call from Node#[]

Thanks to Ben Langfeld for pointing this out.
added qvality
Resolved David's comment.
update 3pp version
update bootstrap from 2.0.3 -> 2.0.4
security check is now ibidem/base => development
removed README.rst
前端完成 版本v1.3
Missed a couple of commits
Minor refactoring of repl interaction code
Merge branch 'master' of github.com:stephenalindsay/minnow
Fix test-iteration-start

This was broken by 26b922e0627c81b7cd521df72bd734978a4d8406, which updated
TimedItem to throw exceptions if iterationStart or iterationCount are negative,
as required by the spec.
Don't clip iterationStart to iterationCount

This was agreed in item 4c of Meeting 35
(https://etherpad.mozilla.org/7Qo6P4kYyD) and requires a spec change.
Attempting new UI organization.
Update flash player
Merge pull request #92 from stevecochrane/master

Fixed a bug in api.js that would cause a JavaScript error when entering fullscreen, in HTML5 mode, for browsers that support fullscreen (Safari)
MAJOR REFACTOR: Restrcutured code into class-based components. Setup and configuring should still work the same, but controls and tech elements are now sub-classes for Component, which builds elements and applies event behaviors.
Removed demo source code from repository root. Was receiving pull requests for the release files instead of source files. This makes it more clear where to make changes.
MAJOR REFACTOR: Restrcutured code into class-based components. Setup and configuring should still work the same, but controls and tech elements are now sub-classes for Component, which builds elements and applies event behaviors.
Removed demo source code from repository root. Was receiving pull requests for the release files instead of source files. This makes it more clear where to make changes.

Merge branch 'ui'

Conflicts:
	dev/flash/VideoJS.swf
MAJOR REFACTOR: Restrcutured code into class-based components. Setup and configuring should still work the same, but controls and tech elements are now sub-classes for Component, which builds elements and applies event behaviors.
Removed demo source code from repository root. Was receiving pull requests for the release files instead of source files. This makes it more clear where to make changes.

Merge branch 'master' of github.com:zencoder/video-js

Conflicts:
	dev/src/api.js
Updated error with updating tech support
Fixed some IE comma errors. Made ajax error clearer. Fixed a setup issue.
Added gitignore
Modified some comments
Added support for loading the player first and then setting the source later.
Fixed iOS loading issue.
Removing dev.html and adding dev_example.html to allow for testing without pushing changes to dev.html
Added dev.html to gitignore
Renamed to dev.html.example
Updated readme to talk about dev.html
Cleaned up dev.html.example
Fixed an issue with ajax errors
Native fullscreen with controls added for supported browsers
Added fullscreen with controls to supported browsers
Merge pull request #96 from ZenJosh/master

Added fullscreen controls to supported browsers
Added get_kernel_ids function. Changed debug printing.
Adding flask-tornado webapp
Support hosts in computer config.
build.xml (phing)
Merge remote-tracking branch 'origin/master'

Conflicts:
	build.xml
Добавени git-модули за bgerp, ef и vendors
Добавени (почти) готови за употреба webroot и conf директории.
readded padding
working copy from main project
Invalidating comments with our own custom hooks instead of the default wordpress ones
Remove # issues shipped from model
Add status to subs model
Fuli<perfectrobin@sina.com>
UITable 完成
Enemies can now get killed

Now enemies can be killed, giving you a score increase. Only one enemy
can spawn now
Tests are working under the pypy now
Checkstyle: '}' should be alone on a line.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs@1403349 13f79535-47bb-0310-9956-ffa450edef68
Checkstyle: Variable access definition in wrong order.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs@1403351 13f79535-47bb-0310-9956-ffa450edef68
Checkstyle: Variable access definition in wrong order.

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/vfs@1403352 13f79535-47bb-0310-9956-ffa450edef68
WikiaMobile: Poll: ajax call with no function overhead

git-svn-id: https://svn.wikia-code.com/wikia/trunk@58808 e846bd91-c042-42a7-a218-4b65e2c1904d
WikiaMobile: Clicking linked image opens modal (BugId: 45165)

git-svn-id: https://svn.wikia-code.com/wikia/trunk@58809 e846bd91-c042-42a7-a218-4b65e2c1904d
bumped ion defs: Added a DeviceStatusType which is an enum with values, IN_RANGE, OUT_OF_RANGE, NO_DATA
First draft of swc-wom
swc-wom maybe half-way implemented
Added support for templates, lists and sections
Added support definition lists
INTERMEDIATE WORK
Finished implementation of AstToWomVisitor
Tracking EE 2.0.1. Fixes #1336
wrong md5.
Fix EPEL repo download URL
Sample is added.
Backup files are deleted.
Régression suite à correction #20
added missing GTObjectDatabase and moved all headers to Public in Build Phases
eliminate linkgrp
Add category 'unallocated' to allocation at any date report
Merge branch 'master' of github.com:tedmanahan/Animal-GRIN
update display_pedigree and coefficient relationship
Merge branch 'master' of github.com:tedmanahan/Animal-GRIN
Remove timestamp.
Fix spelling error in test/unit/agr_notofocation_test.rb
Add 'organization' field to animal_popup_entity_search form.
Merge branch 'master' into ted
update inventory status may not work
dynamically update inventory status
Merge branch 'master' of https://github.com/tedmanahan/Animal-GRIN
Merge branch 'ted'
Add a page title for compare taxonomies page.
Modify several search pages so users know which fields on each search form are available for searching
Still needs to be smaller for iphone layout
Implemented rate limiting

fixes #2
It's Friday night and there are tons of zerglings to crush
keep stylesheet and logo in the source - mention if a page has orphaned children
Give a warning if the html page has no title
Changed system and application paths for CI in index.php to avoid the symlinks
Working on deployment script
Working on deployment script #2
Working on deployment script #3
Working on deployment script #4
Working on deployment script #5
Working on deployment script #6
Working on deployment script #7
Working on deployment script #8
Working on deployment script #9
Working on deployment script #10
Working on deployment script #11
Chapter 18: Adding missing marker drawable.
Chapter 19: Adding lunchtime notifications. Removing unnecessary files from previous tutorials.
Chapter 19: Refactoring, mostly whitespace and string resources.
Chapter 19: Refactoring, moved string resources for static declarations back to hardcoded strings, it's no longer causing issues.
Blogansicht
Glitches in auth css
Initial import of files of my OpenCL notebook
Documenting: diff counter
change return value of some methods to an interface to reduce the type cast. modify some details in the code
Merge pull request #3 from suiningzeroy/master

def
main menu - fixed button position
about - fixed transition
settings - fixed transition
meal wheel - created (tutorial done, meal wheel not done)
main menu - fixed button position
about - fixed transition
settings - fixed transition
meal wheel - created (tutorial done, meal wheel not done)
Teste do tracado do mapeamento feito.Sucessogit add .
fix for favicon.
Misc/Scripts: Some fixes for creature_text
Core/Hunter: Fix Furious Howl targets
DB/Scripts: Add missing creature_text for Kel'Thuzad in 33c44594cd85e6ddbaae566e65ec13809b870d51
Closes #8562
Core/Mail: Fix float-calculation of expire-time
Merge pull request #8568 from FH3095/int2float

Core/Mail: Fix float-calculation of expire-time
DB/Scripts: Fix copy and paste fail in 40b010e3ad9ca2bbc7ad4dc4bc469362f4e1d7b5
Core/Map: Kill Engrish (thx Takenbacon)
Closes #8574
Core/DB: Creature text for 53 script files
Merge pull request #8570 from Gacko/creaturetext

Core/DB: Creature text for 53 script files
Core: Fix non pch build
Core/DB: Creature text for 22 script files
Merge pull request #8582 from Gacko/creaturetext

Core/DB: Creature text for 22 script files
Port check for File APIs from old app (block IE)
Prevent selection of toolbar buttons
Update headers and labels
PaymentOption seems to be namespaced under Hotel
Merge pull request #24 from rthbound/patch-1

Fix the example in the README.
teclas wasd e superpoder repetido
Merge branch 'master' of github.com:tiagobabo/feup-battles
this should make it start again on reboot (not tested yet)
repaint color texture nun möglich
beim resume to screen wird nun wenigstens der player wieder gemalt
fix on the position of the menu while open
Gemfile
Merge branch 'master' of https://github.com/timlatorre/barterville
schema.rb
Merge branch 'master' of https://github.com/timlatorre/barterville
Merge branch 'master' of https://github.com/timlatorre/barterville
user show page and logout fix
adding info messages
creds to env, parse signed request
deleting unecessary struct
Basic FB functionality.

Boxes are drawn to a <canvas> in place or characters.
Add a Ruby script to parse CSV files
new folder 'avr' with test project to test the AVR on USB-AVR-CPLD

* makefile with compile, program & clean targets
* src/avrtest.c file with test code (@ the moment a simple uart loop)
added new social icon for goodnesstv
Merge branch 'prod'
Rework the matplotlib bug workaround to attempt monkey-patching.
added net-print/cnijfilter:2.70 and (m) edit/upate
Adding support for websockets communication, closes #10.
handle object jsonification serializing __dict__
Removed test messages. Updated version number to v0.4.1
Made AntiPvPListener not go away.
add some useful alias for du, df and rsync
Changes for Strict Error Reporting
Version Update
Add linker support for PIE

Modify the dynamic linker so that executables can be loaded
at locations other than 0x00000000.

Modify crtbegin* so that non-PIC compilant "thumb interwork
veneers" are not created by the linker.

Bug: 5323301
Change-Id: Iece0272e2b708c79034f302c20160e1fe9029588
linker: Fix the computation of si->base

The computation of si->base assumed that the first entry in the
program header table is a PT_PHDR. This results in the dynamic
linker crashing with a SIGSEGV/MAPERR when trying to load some
of the NDK unit test programs, which happen to have an EXIDX
header first, followed byu a PHDR one.

This patch fixes the computation by parsing the program header
table, looking explicitely for the PHDR entry. This fixes the
load of the NDK unit test programs, and doesn't affect system
libraries.

Change-Id: Id18ea6037dbe950b5abbbce816c2960321f0b81d
linker: set LOCAL_NO_CRT := true

Use LOCAL_NO_CRT to prevent linking against crtbegin.o, rather than
messing with build rules. This also prevents linking against crtend.o,
which isn't needed for the linker.

Change-Id: I0c5b9999be7e8676560fe145c1c033ffce8db4d1
Make the linker relocatable.

Previously, the linker always loaded itself into the same
location in memory, which inhibited the effectiveness of Android's
ASLR implementation. Modify the linker code so it can be relocatable
and link itself at runtime.

Change-Id: Ia80273d7a00ff648b4da545f4b69debee6343968

Conflicts:
	linker/Android.mk
	linker/linker.c
test.c: more testing on destin node functions.
WebcamExperiment: show beliefs of 1st node of each layer
test.c: test unit test functions
renamed CMakeLists.txt project to DavisDestin
uniform destin: added sharedCentroidsWinCounts ssPersistWinCounts, ssds, ClearSharedCentroidsDidWin, Uniform_AverageDeltas, Uniform_ApplyDeltas
Added more unit tests for it. still incomplete.
modified:   application/config/autoload.php
	modified:   application/config/config.php
	modified:   application/config/constants.php
	modified:   application/controllers/configuracoes.php
	modified:   application/controllers/facilities.php
	modified:   application/controllers/main.php
	modified:   application/controllers/usuarios.php
	new file:   application/core/MY_controller.php
	modified:   application/logs/log-2012-11-13.php
	new file:   application/logs/log-2012-11-14.php
	new file:   application/logs/log-2012-11-19.php
	new file:   application/logs/log-2012-11-21.php
	new file:   application/logs/log-2012-11-22.php
	new file:   application/logs/log-2012-11-23.php
	modified:   application/models/TestesUsuarios.sql
	new file:   application/models/configuracoes.sql
	modified:   application/models/usuario.php
	new file:   application/views/configuracoes_editar.php
	new file:   application/views/dashboard.php
	new file:   application/views/dashboard_comum.php
	new file:   application/views/dashboard_superadmin.php
	new file:   application/views/facilities_adicionar.php
	new file:   application/views/facilities_listar.php
	modified:   application/views/inicial.php
	deleted:    application/views/login.php
	renamed:    application/views/inicial.php -> application/views/modelo_marckup.php
	deleted:    application/views/newhtml.html
	modified:   application/views/usuario_adicionar.php
	modified:   application/views/usuario_editar.php
	modified:   application/views/usuario_listar.php
	modified:   css/style.css

message: thais-v0.3
Change to a table
Added chosen, styled escape index, no to show
Merge pull request #9 from travisvalentine/style

Added chosen, styled escape index, no to show
Set UTF-8 for javac
working on run in PLS
Simplified examples a tad
added autocomplete ex
Update models for better multiple judgment functionality.
Merge pull request #65 from echen/multiple_judgments

Update models for better multiple judgment functionality.
autolinkingの確認用ページ
rooms file for defining rooms
Add header footer assets
bug with failures
add dhis2 app
Modify READMEs
Exclude IDE
Install dependencies
Modified dependencies
Removed secure information
Converted files to example versions
Merge remote-tracking branch 'origin/master'
Removed depreciated plugin structure.
Customized rake files to have one for both database.yml and secret_token.rb generation.
add append_annotations.pl to the list of steps
Altered to use as a localhost deployment
Add notes about quartz
Add link-checker quartz example (used upgradingdave-archetypes!)
Publish Episode 12: Jobs using Quartz
Fixed team join problem.
adding userlist with mxml
shadows on stars
Upgraded to 0.4.1
Customer selection dropdown list problem fixed
Menu reformatted
config.php modified - mysql user changed to servicetracker and database name as well
Changed linklist.* to list.*
Merge branch 'master' of https://github.com/veeableful/KISS-Engine
Newline at the end of Rakefile.
Added a 4D sphere (i.e. S^3).  But only partly done.
temp

 * Document Address.decode();
 * Merge CharsetEncodedString into EncodedStringValue
 * Merge ClassIdentifier into MessageClassValue
 * Export missed coder objects
 * Fix test scripts as well
 * ReplyChargingValue is defined in MmsPduHelper, not WspPduHelper
Rename X-Mms-Retrieve-Status specific errors

MMS defines several status groups. They may have errors of the same
meaning but assigned with different numbers.
Bug 761057 - Part 3: Add required encoders for M-Send.ind/M-Send.conf PDU
The sentiment override was broken due to data structure change. Fixed for now with hardcoded search term
Fix for following error (if you start with --port= or -p): [-] File "/usr/lib64/python2.7/socket.py", line 224, in meth [-] return getattr(self._sock,name)(*args) [-] TypeError: an integer is required
Adding ERb syntax highlight
updatge photo process
updated to work with kohana 3.3
updated to work with kohana 3.3
Primer commit de la nueva estructura
Añadida la posibilidad de eliminar articulos del almacén
Añadida la activación de software en tiempo real.
Posibilidad de eliminar entradas.
Cambios Menores
Añadida gestión de entradas a barras.
Subida de applog
Ocultar la realización de informes de empleados.

Añadido Notificador de Stock a falta de datos de acceso de cuenta de
correo.
Informe parcial completo.
Informe finalizado.
Proyecto Finalizado.
Se han tenido en cuenta los tickets especiales.
Añadida opción de genera informe de puerta y barra.
Corregido el problema de guardar las asignaciones de empleados.
Añadida caja en el informe
Arreglado problema con informes.
Solucionado problema con conteo.
Solución de todos los errores.
Solución total
Errores solucionados
Moved tests into package
Fixed bug with button state
code pretification, todo added
More stuff works, but until the API is consistent I'm halting work on this.
Add path to an exec resource.
添加文件删除
删除不需要pom_gs
update
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/support/game' into t/support/game
Merge branch 't/support/game' into refs/top-bases/t/support/usf
merge
merge
cpe.net connector断连后没有重连的bug修复
Merge commit 'refs/top-bases/t/support/usf' into t/support/usf
Merge commit 'refs/top-bases/t/support/game' into t/support/game
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge branch 't/support/game' into refs/top-bases/t/support/usf
usf.bpg_rsp加载初始化失败增加保护
创建空的om_gpr模块
cpe.net 断连后没有重连的bug修复
cpe.dr读入多级struct的错误修复
Merge branch 't/support/dr2' into refs/top-bases/t/support/game
Merge commit 'refs/top-bases/t/support/game' into t/support/game
Merge branch 't/support/game' into refs/top-bases/t/support/usf
Merge commit 'refs/top-bases/t/support/usf' into t/support/usf
cpe.net net_connnector port hton
usfpp.logic LogicOpData add copy_same_entry function
test code review
code review test
code review
code review
0.8版本

支持 正则元字符做为分隔符；
支持HTML注释开头做为分隔符 <!  !> ；
优化内部变量性能
więcej README
fix socket.io issue