labofsahil/github-event-dataset-2012 huggingface dataset:
Coalesce the "cycle initiated" messages so that they don't build up when the client is paused (causing the failure in ViewClientTest)
Merge branch 'master' of github.com:/OpenGamma/OG-Platform
Adding risk factors for equity barrier options
adding 'project' to batch scripts
Add LocalDateRange Fudge builder
Run the testng tests in parallel

Projects that don't work can set tests.testng.threads=1 until fixed
Exclude conflicting slf4j-log4j12 from Quartz library in pom
GS-9735

DEBUG - try to locate which Cache context is created in space and not being freed and gets the shutdown process stuck in Guaranteed Notifications.

git-svn-id: svn://pc-lab14/SVN/xap/trunk/openspaces@118774 eb64e737-3616-4df0-8941-5ee2ae88103d
Added new Night skin

See support thread @

http://www.world-of-satellite.com/showthread.php?20718-Sneak-Preview-new-ViXBMC-skin

What i have done is below:

Taken away any links to magic-hd and copied those folders from the
magic-hd-common folder into vixmbc-nights main folder and renamed any
referances to point to the vixbmc-night folder (shouldnt need magic-hd
now to run).
Added more screens
Copied over network screens from vix-hd to maintain stability.
Basic Commit

Pushing current code base.
bug fixes for facebook reports ->likes
name under messages css style
invite friends firstLogin
Merge branch 'master' of https://git@github.com/PADGETS-EU/Padgets-UI.git
Moved after_install steps to before_script because they weren't working
in after_install
Debugging output for Travis build
cameras update
result que split into two

update in router and shipping.
Alignement du texte
Merge branch 'master' of github.com:PlayOnLinux/POL-POM-4
Added a friendly, non-reflective way of getting world groups into the
API.
Renamed variable to make plugins that use the groups variable aware that
there is now a safer way to do it.
Added listener for commands.
Added the gh-pages.
build: fix target header overlay

LOCAL_C_INCLUDES as defined by the makefile should be put AFTER
the overlay includes so the overlay always takes precedence.

Change-Id: Ib895440be362871caee296bafad76a51d5d0c799
Merge "build: fix target header overlay" into ics
Merge remote-tracking branch 'cyan/ics' into allwinner
Updated RVMRC to 1.9.3
fix Makefile for .git
Revert "partially revert mr1911"

This reverts commit d275705df5e3dbf88c695f1b341ad186d84a3734.
Adding git ignore file blocking html files
[Gideon] Retrieving data from db for saved route view again...
[Gideon] Graphics. 

- Changed Splash Screen to 1 instead of 2.
- Changed color scheme to white , grey and orange.
- Changed orange color to #ff4800 instead of #ff4200.
- Changed the icons on home screen and took away the highlighted border.
- Changed the way the map screen layout is loaded.(Changed to percentages so that map will fit on all screen sizes.)
Core/Spell:
Add Github ribbon.
Improve the error border.
before tab controller change
Added block alert CSS overrides
Ingredient.default_unit is now nullable + migration
[#1126] Styling fix.
added howto (start) to readme.md
Small optimization to carousel preset
Removed unnecessary isnew class, added debug logging function to prevent browser errors when testing
Item events now bound via delegation. Optimized event handling in scrollbar. Window mousemove now only active when dragging.
Moved external js libs to contrib subfolder. Simplified example code. Improved text. Fixed fancy box integration.
Added simple example for thumbnail preset
Rondell is now inactive when window is blurred.
Reenabled autorotation for carousel
Static Page Controller and Twitter bootstrap installed
Update for 0.14
Install docs: lxml on Homebrew
Copyright correction.

Signed-off-by: Norv <norv@simplemachines.org>
Tweaking copyright line for accuracy. (thank you Thantos)

Signed-off-by: Norv <norv@simplemachines.org>
Merge pull request #213 from norv/2.1

Copyright correction.
Created the solution for the project
Added ReferenceAssemblies folder
Removed unneccesary reference assemblies
Removed unnecessary reference assemblies 1
Removed unnecessary reference assemblies 2
Removed unnecessary reference assemblies 3
Removed unnecessary reference assemblies 4
Removed unnecessary reference assemblies 5
Removed unnecessary reference assemblies 6
Removed unnecessary reference assemblies 7
Implemented GitIgnore file
Added a Sitefinity website project.
Removed migration module files from the website.
Fixed the references for the website
Skeleton of Backone based MVC designer

Implemented a skeleton of MVC desginer based on Backbone.js
Implemented ListType property.
Implemented ListType property.
Fixed problem with loading properties initially.

When designer was opened for the first time, properties were not loaded.
Forgotten file for the last commit.
Made the backbone base designer generic.
added widget class, xml, and updated manifest for widget
fixed minor details. widget added
added widget service and updated widget to allow clicking through lunch places on home screen
Install gems
Add Guardfile
Customize Guardfile
casern_storage script
Add a StaticPages controller
fix Gemfile, Rspec works
Finish static-pages
Eliminar JQM Select
Core/Player: Fix crash in Player::CanUseBattlegroundObject when called from certain spells
Core/Spline: Improve error output for SpineInitArgs check

by Schmoozerd
Fix build
Remove some dead code
Prevent warnings
Merge pull request #8230 from krofna/dead_code

Remove some dead code
Core/Chat: Prevent client crashes with invalid chat language and message type combinations

Fixes #8083
Core/Spline: Change recently added error output to print DB GUID for creatures
Core/Guild: Code Refactor
- Send correct events when modifiying Ranks (Add, modify, delete)
- Store money/slots withdraw, not remaining slots. This will update remaining slots/money properly.
- Reset daily slots/money withdraw for all members at same time, configurable
- Better debug messages
DB/Loot: readd loot to stinky from clean 49 (removed by accident)

Closes #8222
Core. Fix non-PCH building (again)...
fishing: set respawntime to now when cant loot, for correct despawn of bobber
removegameobject from player instead cancel spell, for correct remove of fishing aura
fix random typos (f.i. blocked activation autocast petspells from spellbook)
Core/Misc: Define CR_MASTERY combat rating
Pets should face same direction as owner after follow.
Fixes #8248
Merge pull request #8249 from MrSmite/Pet_Facing

Pets should face same direction as owner after follow.
Merge pull request #8245 from ille/randomtypos02

fix random typos (f.i. blocked activation autocast petspells from spellb...
Merge pull request #8246 from ille/fishing

fishing: set respawntime to now when cant loot, for correct despawn of b...
Merge branch 'master' into 4.3.4
Note: Will need extra Guild-Related commit to make it work again (Added some extra data beside the merge)

Conflicts:
	src/server/game/Battlefield/BattlefieldHandler.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Guilds/Guild.h
	src/server/game/Guilds/GuildMgr.cpp
	src/server/game/Guilds/GuildMgr.h
	src/server/game/Handlers/AuctionHouseHandler.cpp
	src/server/game/Handlers/BattleGroundHandler.cpp
	src/server/game/Handlers/CharacterHandler.cpp
	src/server/game/Handlers/ChatHandler.cpp
	src/server/game/Handlers/GroupHandler.cpp
	src/server/game/Handlers/GuildHandler.cpp
	src/server/game/Handlers/ItemHandler.cpp
	src/server/game/Handlers/LootHandler.cpp
	src/server/game/Handlers/MailHandler.cpp
	src/server/game/Handlers/MovementHandler.cpp
	src/server/game/Handlers/NPCHandler.cpp
	src/server/game/Handlers/PetHandler.cpp
	src/server/game/Handlers/PetitionsHandler.cpp
	src/server/game/Handlers/QueryHandler.cpp
	src/server/game/Handlers/QuestHandler.cpp
	src/server/game/Handlers/SkillHandler.cpp
	src/server/game/Handlers/SpellHandler.cpp
	src/server/game/Handlers/TaxiHandler.cpp
	src/server/game/Handlers/VehicleHandler.cpp
	src/server/game/Server/WorldSession.h
	src/server/shared/Database/Implementation/CharacterDatabase.cpp
	src/server/shared/Database/Implementation/CharacterDatabase.h
Core/Scripts: tweak code in pyrewood_ambushAI::SummonCreatureWithRandomTarget()
Flypaper: at least a couple of margins
no __dead
Fixed module reference to InitOptions.
Fixed security group handling.
Move backoff_runner code to separate submodule for improved re-use.
In-memory DB (HSQL) introduced and used to load questions on the 2nd step
Merge branch 'master' of https://github.com/SuicideNote/vashapara

Conflicts:
	pom.xml
Prep 0.7 release
In-place editor for cards in place. (lol). Restored missing js libs.
Disabled errorhandler when checking fsockopen in core files trinity.php and mangos.php which should help with issue #25

Updated base version to SHA: f60fa168a2a20e57ee73071ebffa92bfc78a9f61

ToDo: Completely check the sendmail function for errors
some methods in model
Started the adapter
el break y la diagonal del betto
Started adding the style guide
Dan's commit
erste änderung
Merge pull request #1 from Guedy/master

pull mal
.gitignore: ignore fortran-examples/ cruft
Committer: TrashyTrash-
new file: Gemfile
Added new datavalues to the intmap, we either use the old inventory code or the one @Edoxile is making, no clue, but hope it will be done fast
Add pre ingest alter
Merge pull request #201 from mitchmac/7.x

Add pre ingest alter
Enhancing AuthFailed template
Fix in ShowContattoDocente
Backport to doctrine 2
Adding the Chapter 15 challenge
Pull in latest clouderamanager code
Enable installing rpm packages on Debian using alien
Merge branch 'master' into cloudera-os-build
Add pre and post hook support for state transitions in control.sh
Merge branch 'master' into cloudera-os-build
Eschew barclamp merge conflicts.
Merge branch 'master' into feature/ip-hacking/master
Eschew barclamp merge conflicts.
Move barclamp submodule refs back.
Merge branch 'cloudera-os-build' into feature/ip-hacking/cloudera-os-build
Move barclamp submodule refs back.
Merge branch 'feature/ip-hacking/master' into feature/ip-hacking/cloudera-os-build
Fix up get_repo_name
NORMAL added support for true-only if in functional if.
NORMAL updated more-info.md
More map code cleanup
Allows to filter projects by text
Improves maps performance
Added variable type.
[UPDATE] update gui
BUG: Fix API types for minpack.
TST: filter test warnings from cluster.vq test which uses random numbers.
Merge pull request #269 from stefanv/minpack_API_types

BUG: Fix API types for minpack.
no message
Revert "no message"

This reverts commit 55aaa8e68f9c4c241f923e9d429a8f05932c3131.
Merge branch 'master' of https://github.com/WebEngBlog/WebEngBlog
changes in the telecaller page
update tournament detail view template
Delete randomize from slider's configs
Prevent hanging on build errors on Linux

Change linux build command to use "-interaction=nonstopmode" like OS X
does. This prevents hanging in the build process when, e.g., an include
file is missing.
Include bibliographies in tex root for cite completion
recursively searches through all tex source (from root) for referenced bib files for cite completion
remove any potential bib file duplicates
search \include commands for referenced tex source in cite completion
Merge pull request #55 from dfleischhacker/patch-1

Prevent hanging on build errors on Linux
Merge pull request #66 from cwwwu/master

Multi-file cite completion - THANKS cwwwu
include support for defining TEX root in sublime-project file; includes patch from Westacular issue #67
Merge remote-tracking branch 'cwwwu/project-file-support' into feature/projectFiles
Better way to find the main file if there is a project file
Merge pull request #70 from jrast/feature/projectFiles

Project File Support for TEXroot; ref completion now tex root-aware and understands \ref{} and friends.
Some fixes to jrast's last commit
Ref completion: minor fix and first stab at ref command (quick panel)
Cite completion: trigger on \cite{} as well as cite_, like refs, first stab
Cite completion: prep for new trigger, recognize \cite{}, use getTeXroot
Updated README
Remove '\ref{}' from ref completion popup
First stab at unified auto-dispatching of ref/cite completions
More robust matching in ref cite dispatch (I hope)
NEW-STYLE KEYBINDINGS.
Ignored idea config
misc:init
misc:update
misc:up
Merge branch 'master' of github.com:XForest/game-off-2012
misc:up
XSession::procAuth correction test des droits sur suid
XSession::procAuth correction test des droits sur suid
Add support for Markdown scripts
fix md strong, italics and use a different color for headers
Merge branch 'markdown'
Fixed a problem whereby $LD_LIBRARY_PATH would be empty.

Signed-off-by: Paul Buonopane <paul+git@earth2me.com>
update to Google Maps 3.10
fix initialization problem
Remove warnings
Posibility to consult the manet routing tables, the static method getRouteFromGlobal can search in the internal routing tables of every node and extract the path if exist
to activate this. Include in the ini file **.PublicRoutingTables = true
Completed example 10.11
passing
Completed example 10.14
passing
Completed example 10.16
passing
Completed example 10.18
passing
Completed example 10.22
passing
Completed example 10.28
passing
Completed example 10.28
passing
Completed example 10.28
passing
added log formatting
Completed example 10.37
passing
Completed example 10.37
passing
Completed example 10.45
passing
Completed example 10.49
passing
Add user microposts
Completed example 10.49
passing
Completed example 10.49
passing
added callbacks related to checking collisions.
Nuked the old server, standing up the new one
Add style to the home page links
Merge branch 'master' of github.com:acm-uiuc/mango-django
hwmon bugfixes
b
added extract to hwmon tbs3
missed a couple of org.pingel references
Done. Done. Done!
Adding SASS Version (Because it clearly rules)
Automatic detection of cell arrays and matrices
renamed enum to enumeration
updated to be more strict
Merge branch 'master' into gh-pages
no limits on height/width by default
mmc: cleanup unused variables
Check if a set of branches have been merged.

This is the opposite of git branch --contains. Basically git branch
--is-contained
Update README
clean up git-erase-file
[Cookbook][Validation] Updated the cookbook to the latest Symfony2.1 changes
change method name. and fix bugs.
simplify to setup database.
simplify to setup database.
add saving method to database.
Use minecraft-server-pkgmcp as a library
Automated rename test
upgraded ngx_lua to 0.5.0rc26 and ngx_srcache to 0.13rc7.
arribode
Refactored namespaces and tidied up Using statements.
updates to download service to support audio downloads - not integrated yet.  send event from audio service if stopped due to file not found.  stop service in certain cases.
fix download bug.  thanks @wnafee
search now works and highlights the arabic result.  improvements to database code, bugfixes, and an attempt to make handling downloads easier.
Revert "trying to format text, looking for an easier way."

This reverts commit 22caffed3df2a5f815be2fbd2cea8333cb396fc8.
Created formatting for receipt.  Just need to add customer name.  Then I'll need to comb through code to add comments and make sure I'm following best practices.
Stop if matched backend code.
Stop if matched advanced option to UI.
New component for easier creation of topic summaries with switch.
Preparing for 1.9.1
added compute node script
test netbean up commit
DirectMessage Entity Support. Issue# TFJ-646
first commit
Merge branch 'master' of https://github.com/akshayknarayan/hermes
README merged
Archivo de base de Datos
Descargas wallpapers y comunidad funciona
Miercoles noche. Comenzando a hacer los templates de eventos. T1 falta
cargar imagen
added a cname redirect
nimbus scripts tested and updated
removed old nimbus script
first porting to new data model

still have to fix some actions (destroys mainly) and generation of
percepts
Signed-off-by: Allen Wang <allen.y.wang@gmail.com>
pre-compute goal tables and save to df
use database cleaner, check if population task works
Fix intermittent failure when editing permissions

From close inspection of the parameters from when the errors occurred,
an ID was not being supplied by the browser for the permission which
the server was trying to create.

I believe that the following happened (and I successfully reproduced):
 * The user was created/edited once, and they did not have a pre-existing permission
   for one or more application. The server therefore created it on submit.
 * The admin user clicked back (i.e. not being rendered a fresh page containing the
   new permission ID)
 * They submitted again, and the server tried to create another permission, but failed
   because it already existed.

The fix, therefore, is to always create the permission before it is
rendered to the browser, hence it always has an ID.
UI to set Permissions when creating a user
Move to cpp files all code except templates.
adding sprites to mobile
Users managment removed to Admin::UsersController + confirmation checkbox
added highlighting of users currently working on target projects
Created admin-available user edit/delete
Corrected field saving in admin/users edit
Merge branch 'hotfix/admin-user-edit-password' into develop
emphasise current task
project\'s users current task added
whenever gem added and set
tasks sorts by accepted
Merge remote-tracking branch 'bartek/develop'

Conflicts:
	app/views/layouts/application.html.haml
	app/views/projects/index.html.haml
bogus
New initial commit
Added date object
Added high chart
Added typekit for proxima-nova headings
Remove duplicate guard-rspec dependency
Merge pull request #89 from andyw8/remove_duplicate_guard-rspec

Remove duplicate guard-rspec dependency
Updated website to first public version
modified read me
Merge branch 'master' of git://github.com/andrewxu/movietwitics
Added redis support to application; Removed active_record references
Resolving conflicts in gemfile
Merge pull request #4 from carrotderek/master

Redis + Resolving conflicts
Module level organisation by using sub package names
Caputue http status code
Stats rollup scheme is pluggable. No longer uses lousy timing measurement
First cut at stats capturing
Merge branch 'master' into dev
The obligatory no-op stats tracker
Quick intro on usage
Introduction to usage
switch logback as the slf4j impl
Pipeline objects are created once per request. So there is no need to use a hashmap to carry a state object. We just attach the per-request tracker directly to the pipeline
Merge branch 'dev'
Added support for HTTP POST
form posting example
Use a newer version
Fix a typo.
Merge pull request #11 from Max-Might/master

Fixed a small typo in the docs.
header, hyster paramter type
Merge branch 'master' of github.com:anykey0xde/anykey-sdk
READ githubified, explanation of where to get tools
started adding rocks/collisions. pushing for alice.
added collisions with rocks
removing print statements
commiting stuff so i can pull
rock collision, merging and stuff. obstacles aren't being read in properly.
o Removed some duplication
fixed a small bug with the AllCaps filter that I didn't see
postgresql and nginx up and running
APF-1339: Updated Persistence Tutorials for 2.2 Release.
Don't sniff for GM_info, as it is always part of the script source.

Fixes #1582
Script 'modified' change always has ID for data.

Fixes #1581
Fix levelup machine slot on FF in OS X.

Also took the opportunity to add some png sprite images
to the images_to_preload array.
Use the same box for author and player results (closes #903).

With the new design, the two boxes were so similar that keeping
them separate led to needless code duplication.
In fact, the only thing that is different with author vs. player
results are the explanations.
Upgrade SoundManager2 to the latest version (refs #904).

I was hoping that this might help with the looping issue,
but unfortunately it doesn't change anything :(.
Update the django template with new sound definitions.
Make tabs aware of tables (closes #804).

Tabs are now highlighted if the player is the owner of the next
game in the table, or if the next game in the table is ready
to be played.

The postprocess plugin hook was used to add next_owner_id and
next_player_id info into the response of the 'tabs' type state
request.

Because I needed to access the player_id in the postprocess hook,
I changed the signature of the postprocess function to take a second
parameter, which is the original request.
I believe that even in the postprocess step, having access to the
request is a completely valid expectation.

There are currently two problems with tabs highlighting when it
comes to tables:

- Because a new game of the table opens in a new tab,
  the tab of the previous game always remains highlighted
  (since the next lame is obviously ready).
- If a table is destroyed (such as after a server restart),
  each player is marked as the next owner, which means that
  after a server restart, all tabs containing games in the
  'complete' state will be highlighted.

The first problem should be solved by one of the future tasks,
where the next game of the table will open in the same tab as
the previous game (or will at least create that illusion by
automatically closing the previoius game tab), so that shouldn't be
a problem.

The second problem is trickier and I don't have an answer yet.
Improve the table postprocess test (refs #804).
Replace the levelup banner image (refs #897).

The old image wasn't cropped properly.
Fixes sound looping (closes #909)

This implements sound looping using recursion, as opposed to
soundmanager's builtin "loops" parameter (which doesn't work).

Although looping works, there is a small delay between loops which I
could not manage to get rid of.
Uses proper squiggle slice (fixes #900)

Uses the new proper squiggle slice.
Fix typo in Django template (refs #909)
Added dependency on sass-rails
Fixed version number.
Merge pull request #23 from mwanji/add_sass_dependency

Added dependency on sass-rails
Add Haml/Sass/SCSS highlighter
did minor change just to check if it works
Package rename, fixed monotic increasing issue with 2d tables.
Add listen button. Improve scrolling.
Tidy up the code. Add status to Engine(). Move debugger to Handler().
Don't load Engine here.
TickTackToe initial
Player interface changed to class
  test
Merge branch 'master' of https://github.com/artur-kacen/JavaGuru1.git
Always perform one iteration of the outer loop of IP method.
Added circular walk pattern.
Added API for multiple apertures
Removed ReSharper files
Updated gitignore
Updated jQuery
Installed NiHibernate, Moq, Ninject, Facebook SDK, Scaffolding, JSON.NET and RestSharp
excluding addons directory
Update to work with libxml 2.9.0
Fix test, from PR 158
Skip tests reply on Zend MM turned on

Those two tests have expect memory exhausted fatal error
Fixed bug #62795 (Zip extension version not defined)
Fixed bug #62763 (register_shutdown_function and extending class)
Rename mcrypt_cbf -> mcrypt_cfb

Also fix ECB -> CFB in the initialization vector size call (not that it
makes a difference, they have the same size).
Ask for less random data in mcrypt_create_iv

Otherwise the RNG blocks and the test takes a lot of time to run (and
occasionally fails).
Merge branch 'skip-memory-exhaust-tests' of https://github.com/reeze/php-src into PHP-5.3
Fix exif test failure

There are two slightly different error messages for invalid pointers, so
make the pattern slightly less strict to account for both.
Fixed bug (segfault due to retval is not initialized)
Merge fix e7535e06e63104ccc0c90c4425b6c2541aa3c939 to 5.3

thanks for reeze.xia@gmail.com notice this
Architecture decision on how to solve the Screen state synchronization issue.
Removing deprecated variables, moving tag
Updating gemspec
updating readme
redirects and textareas auto-resize fix
Reduce noisy stream closed logging.
Practica 1 grep sense arguments
Merge remote-tracking branch 'origin/master'
Corrección de redirecciones después de login
added proper tabbing to newpost.php, adding in structure for require.js
adding default config page
fixing config file so that the real one isn't version controlled
moar style changes to code blocks, lists, titles, fixed header in FF
prettifying the newpost form
Merge pull request #1 from julianlam/master

Require.JS Addition + Proper Tab Handling in newpost.php
Removed sending of other and include options for facet ranges if they are not set
Merge pull request #83 from shieldo/optional_params_for_facet_range

Optional params for facet range
small fixes
merge of fix in the development branch
Still working on following/unfollowing - not working yet
kpr error
including forgot_username route
Merge pull request #111 from jahart/rails3

including forgot_username route
installer: fix mounting, unmounting of filesystem images
Cleaned up 'logo_hand.png'.
Update notes for submitted changes

* new ks_meta variable static_networks
Fix pxe conflicts between arm and x86 systems.

if filename is not specified for uboot/arm systems then we end up using the
same pxelinux.cfg directory that x86 systems use.  This causes a problem when
a default file is present because the format of that file is not understood
properly by uboot/arm systems.  This is fixed by specifyng a dummy filename
entry which is down a directory level.  All further requests will be from
under that level.
计算2到1000000之间的素数
Merge branch 'master' of github.com:beginnerlan/interview
Changed to field access for Hibernate entities and carried out
encapsulate collection refactoring.  Also fixed a bug where the
plaintextId was being shifted twice when removing Genes.
add ZK MVC Basic GenericForwardComposer
Updated CB Wizard for Linux to use PG
Merge branch 'develop' of git://github.com/openframeworks/openFrameworks into develop
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	apps/devApps/projectGenerator/src/main.cpp
Added some missing virtual folders to project file
Merge branch 'develop' into cbwizard
rollback to original files
Added functionality to load video from a URL.
Updated example project to work with a URL path.
Update and copy-edit readme.linux
Windows patch for openFrameworks
- Added missing elif statement for mingw
- Changed the compiler from 4.4.3 to 4.6
Reverted the 'fix' for Mac/Linux builds as it causes the examples not to build on Windows.

NDK docs state:
Support for the gold linker is only available for ARM and x86 architectures on Linux and Mac OS hosts.
This support is disabled by default. Add LOCAL_LDLIBS += -fuse-ld=gold in Android.mk to enable it.
Added -fuse-ld=gold parameter to LDFLAGS for Mac/Linux platform
Merge branch 'develop-osx-mountain-lion' into feature-qtkit-loadurl

Conflicts:
	libs/openFrameworks/video/QTKitMovieRenderer.h
	libs/openFrameworks/video/QTKitMovieRenderer.m
	libs/openFrameworks/video/ofQTKitPlayer.mm
Merge branch 'develop-osx-mountain-lion' into feature-qtkit-loadurl

Conflicts:
	examples/video/osxHighPerformanceVideoPlayerExample/src/testApp.cpp
	libs/openFrameworks/video/QTKitMovieRenderer.m
Fixed position calculation to work when [QTMovie currentTime] and [QTMovie duration] have different time scales (this happens when loading movies asynchronously).
Just checking the parameter instead of re-parsing the protocol.
Updates to ofRectangle::ScaleIntoMe. 
Now ofRectangle::ScaleToMe.  
More scaling options via ofRectScaleMode.
Added the missing offset.
Merge remote-tracking branches 'official/develop' and 'origin/develop' into develop
oof, how did I miss this? Changing keyDown to keyUp
Update lib/cap_bootstrap/version.rb

Bump version
bootstrapped homepage, in progress
bootstrapped, biatch
Need to add more tests before this is ready for use
The cause the encryption problems
Maybe there still was problems with encryption
Added integer casts for vector coordinates

Signed-off-by: Irmo van den Berge <bergerkiller@gmail.com>
Fixed bug #43: [css] when you hover the mouse over the menu on the left side of the block overbroad, the selected link
Add version numbering.
Remove unused code chunks
Add .my.cnf support.
Add mysql-defragger to git.
Random heinz
active only uses uploader now
Merge branch 'master' of github.com:bismark-devel/bismark
gggg
add date
Wildcard query on non existent field matches all documents
fixes #2461
release 0.20.0
move to 0.20.1 snap
restore deleted plugin path modification
release 0.20.1
move to 0.20.2 snap
Merged MultiValueOrdinalArray from 0.19 branch
Merge commit '2f9e7421f7fe9de3357fd5ef67235f716e6702f4' into 0.20
Added another gray color to the BaseDark and BaseLight xaml files, for the theme switching during runtime to work.
Added MIT License and Minified files.
rules: remove unused struct fields and use size_t

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: only export a single function

Really all we need from this file is a way to get xkb_component_names
from an xkb_rule_names, which is now the only thing being exposed. This
should allow for some much needed refactoring of this code.

Since this is only used by xkbcomp.c and uses xkbcomp functions, also
move rules.{c,h} under the xkbcomp dir.

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: don't use custom logging functions

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat input line handling

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: don't typedef the structs and rename them

The long prefix is unnecessary now that they are all private.

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: rewrite get_index to use sscanf

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat SetUpRemap and struct remap_spec

Rename to more descriptive names and reformat.

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat CheckLine and break into several functions

And remove struct file_spec which is really unneeded. Should be
slightly more clear now.

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: use asprintf instead of _Concat function

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat MakeMultiDefs

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat ApplyRule

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: rewrite MatchOneOf

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat CheckGroup and CheckApplyRule

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat CheckApplyRules and ApplyPartialMatches

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat SubstituteVars

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat GetComponents

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat AddRule and AddGroup

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: remove unused struct describe_vars

It's not actually used for anything.

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat LoadRules and XkbRF_Free

Signed-off-by: Ran Benita <ran234@gmail.com>
rules: reformat components_from_rules

Signed-off-by: Ran Benita <ran234@gmail.com>
Replaced tab bar icons in statistics view with a system icon and two glyphish icons (fixes #147)
Removed view transition animations (fixes #71)
fix if player lost
manual update: reallowed links and form submits
53a: LSM303A has I2C address 0x19, not 0x18
Converted to using bundler.
new file:   shake.js
Fixing logs
Monitor file : use last data in file database instead of ion and ctime
Update reference page
Merge remote-tracking branch 'origin/master'
Inhaler Mod
career seeker module - add validation on follow up remarks...
test/{test.html -> index.html}
Fix #746 - template settings are not modified.
Fix #750 - Refactor wrapper.
Merge pull request #754 from braddunbar/template-settings

Fix #746 - template settings are not modified.
Merge pull request #752 from braddunbar/test-index

test/{test.html -> index.html}
Merge pull request #751 from braddunbar/wrapper-refactor

Fix #750 - Refactor wrapper.
Update eproject mode
Fix OS X path problems
Make keychain function interactive
Shell of a script to auto-generate tags
described WTF
mongo db 对group的查询进行优化
增加redis和sqlite的cache驱动
修正Database order by 参数大小写问题
letting google host jquery

google can should be a little faster
High-five script.
deleted sub file and included an igore
Rename Cinch::Plugins::Imdb to Cinch::Plugins::IMDb
HHH-7560 ehcache unit test intermittently failing
(UnknownServiceException)
HHH-7557 - Map entries get deleted
HHH-7134 - Detection of wrong circularity when two tables with same name in different schemas

Fixes FKSecondPass processing to take catalog and schema in accounts. Corresponding test class is
org.hibernate.test.cfg.WrongCircularityDetectionTest.
Added ro/rw host based access privileges like NFS
Abe Lincoln and outage love in the stylesheets; add font.scss and migrate fs variables there; tabs css v0.2; add nav bar v0.1 in css and jade/HTML; add lifted-shadow mixin to variables.scss
removed superfluous chef/ subdirectory
A slightly better README
Add some minor spacing.
A little bit more spacing for a cleaner UI.
Removed the clear button and replaced it with a Remove section button.
Update README.md

Removed example and added NuGet command for Windows 8
Modified AndroidManifest.xml so all activities are not in launcher.
case for equations that are rewrite rules in both ways: ignore them
modified given clause to check whether new clauses are subsumed by given clause
Added global timeout of 60s to all unit tests. enabled Youtube player tests. [#1045]
no cname for my fork
Prevent the list entry from being opened when permalink is clicked
Fixed test of result of sudo()
Merge branch 'master' of github.com:cappuccino/cappuccino into cappuccino
make disabled buttonbar buttons more visible
TabActivity 구성.

이미지 부족.
fixed issue with pdf layouts
making template box clickable
pdf layouts fixed
tinymce editor
catrina - added res folder
searching color added in
Change method to make Constant line work
version bump
uncomment
Removed older version for clarity
amazon associated nodes
forms
Implemented a wrapper on top of DNode so that we can use TLS socket connections
Make SimpleDirChooserUITest more reliable
Update evolveStrategies.m

Reminder that I still need to check some things on this...
Better transferable message detection

Canary builds of Chrome no longer prefix postMessage with "webkit".
Merge pull request #50 from eee-c/master

More robust transferable message support detection
Added server URL property to map up as a placeholder
Undo previous changes: add in new end service and rewrite RepositoryHttpServiceImpl as a thin adapter
Rough code for building a SMART JSON-LD context from the ontology

Give jsonld short classnames as well as predicate names

Give jsonld short classnames as well as predicate names

Remove jsld submodule from smart/scripts
Hacking json-ld into Got Statins
Added rdfparser.js
jsonld.objectify() bugfix; check err parameter on callback
Updated jsonld-with-objectify
Map : to  double underscore in jsonld context generator
Add JSLD to JS client library and update Got Statins? App
Add got statins this time
Remove redundant .resolve call and add .reject calls to catch blocks in connect client
Pass triple statements to jsonld instead of re-parsing the XML
Remove dependency on rdfparser
Using BioPortal sparql as 'terminology server' to identify statins.
Tabs -> spaces
Remove refs to incorrect version of jsonld
Add Joshs fork of json-ld
Update jsonld submodule to correct branch
Fix smart-api-client generation
Merge in new sparql-based statin detection
Remove got_statins local copy of the jsonld lib
Adds the MANIFEST_get back into the connect client
Add unknown filter toggles to the BPC app
Merge pull request #29 from chb/bpc-unknown

Add unknown filter toggles to the BPC app
Adding missing file to API Verifier
Update the API Verifier ontology copy
Remove unnecessary date format conversion from BPC app
Deleting the unnecessary date lib in the BPC app
Updates the BPC manifest
Merge branch 'dev' into BPC_CHB

Conflicts:
	static/framework/pedi_bpc/js/bpc-data.js
Update src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp
pagina di presentazione
Pequeños cambios
Merge branch 'master' of github.com:chepecarlos/ReservaYa
Change interface for effects

-- Refactor common code for next_step. We now do the timing check
   inside Effect::render, which calls a virtual Effect::step
   to do the effect-specific rendering
-- Effect::step can now return false if effect is complete and
   doesn't need to be included anymore.
-- Retrofit existing effects to use the new interface
-- Get rid of print implementations now that things are working
Adds "highcharts" library as another JS charting backend
Add [ExecDir] so we install the main user script
build jobs should be verbose
Rewrite ScoreKeeper in OOP CoffeeScript
Merge branch 'master' into current_page_apphooks
wrote a test for #670, toolbar shown in statically served HTML
no reloading needed
call applications_page_check from middleware
Merge branch 'master' into current_page_apphooks
comment fix
Fixed documentation for CMS_CONTENT_CACHE_DURATION and added docs for MENU_CACHE_DURATION
better test
Merge branch 'master' into current_page_apphooks
added deprecation warnings to dbgettext settings
improved details view coverage, fixed issue 678 (language fallback on root), improved docs on cmsplugin subclasses (663)
Merge branch 'master' of github.com:divio/django-cms
Fixed 674, video plugin issues with frontend editing, thanks to Javi Nievas for the patch
Added Javi Nievas to AUTHORS
fixed issue with video plugin
Merge branch 'master' into current_page_apphooks
Fixed typo in new.html
Fixed google maps plugin loading wrong javascript files
Merge branch 'master' of github.com:divio/django-cms
Merge branch 'current_page_apphooks'
2.1.0 Final Release
First go at a CLI tool
Added command line docs to the README
CLC-813 - Update the dummy json files and documentation for the APIs
https://jira.media.berkeley.edu/jira/browse/CLC-813
added .bak to gitignore
further tweaks
Merge pull request #1 from chrysalids/master

Edit readme
Merge pull request #2 from chrysalids/master

Added new TDD
Merge pull request #3 from chrysalids/master

Added annotations
Remove
Added whatever test
Merge
fix bug in sessions
cleanup
Trying server-side redirect version.
Pointing to server-side redirect on chunktest area.
Removed user grouping on registration temporarily, reason is that we don't
have the default DB yet.
Decorator beverage sample
xapi: Fix live block migration

Fixes bug 1040332.

Xapi VM.migrate_send and VM.assert_can_migrate calls require that
vdi_map parameter is a (source_vdi_ref -> target_sr_ref) mapping, for block
live migration to work, as of XenServer 6.0 RC1.

On the destination side:
This fix modifies the check_can_live_migrate_destination call, so that the
value returned contains the "destination_sr_ref" (XenAPI specific data is
stored under the "migrate_send_data key").

On the source side:
check_can_live_migrate_source and live_migrate calls assemble the
vdi_map by mapping all the local sr contained vdis of the VM to
destination_sr_ref, and passing this parameter to the VM.migrate_send and
VM.assert_can_migrate Xapi calls.

Change-Id: I95f3dca651d2e72fc727646580092a25f558d6ba
Removed _languages.js from core.
Merge branch 't/9232'
fixed bug with handling case with no alerts outstanding
Setup distribution configuration
enable omega theme
experiment with product views and search across site
theming added
se gargreg la pagina de bfonline.html a templates y en el dashboard se hace el boton así como su iconos, ademas de un nuevo aviso
Can build and add Hit Delegates
Added affectUser to switch efefct so it can try and force a switch. Need to fix it so it checks for fainted Pkmn and fails if there are no Pkmn to switch to
i -> gline to make the relationship to the generated line more clear
Porting docslate to jekyll.
Update README to reflect that validate now throws.

Change-Id: Ife69805a1e3948533bf0b604d0d62dacbbd02041
somehow source and sass were not previously committed.  added index.html to all links so cloudfront will work.
Refactor DeleteHandleI for re-use (See #9605)

Though much of the delete logic is under
ome.services.delete, much more had been added
to DeleteHandleI which is not really re-usable.

This commit adds a "Deletion" object to o.s.d
which combines both the binary file deletion
as well as report maintenance of DHI.

As well, since HandleI was originally mostly a
copy of DHI, DHI has now been emptied of logic
and solely uses a delegate.
Deprecate IDelete and omero.api.delete
Check for too many delete operations
Convert java tests to use omero.cmd.Delete
Replace DeleteReport with DeleteRsp
Refactor chgrp.py to cli.py for use in delete.py

The basic functionality of chgrp.py is based on
CmdCallbackI. This logic can easily be re-used
by delete.py if certain extension points are
introduced.
Use RequestCallback rather than DeleteCallback in Insight
Add Warning and Error to ERR on delete failure
Use Delete rather than queueDelete from deleteObjects in OmeroPy
Refactor delete process to use Request call back (see #8881)
Review delete permissions tests (see #8881)
Fix missing DoAll in BlitzGateway
Chosen dropdown style fix (from Blazej). See #9247
Merge remote-tracking branch 'ola-gh/sprint18-bugfixes' into develop
Merge branch 'postdecorators/omeroweb_tweaks_2' into develop
Merge remote-tracking branch 'josh-gh/9605-delete-refactoring' into develop
Do not end up with attribute errors on login failure.
_proxies is on the BlitzGateway not on the client object.
If we're going to cache the key might as well cache the connector.
Merge remote-tracking branch 'josh-gh/9330-memory-leak' into develop
Merge branch 'postdecorators/7202_unittest_review' into develop
fixed iss1421: for beta version release
issue #1421: update change log
Merge pull request #480 from linshun/iss1421_beta

fixed iss1421: for beta version release
fixed #1306 correct some mistake for add comments
Merge pull request #388 from dingpinglv/iss1306_addcomments

fixed #1306 correct some mistake for add comments
god help me, turning off custom errors
added content and social plugins
Use multi_json instead of yajl-ruby

This will make sentry-raven compatible with jruby and others json
implementations.
Merge pull request #20 from sobrinho/master

Use multi_json instead of yajl-ruby
remove duplicate dependency
add decimal type
do not use oracle reserved words in the query.
Change identation
Revert "Change identation"

This reverts commit 050f8e1e5f7e4abdac902ea8122fad62d27ff66e.
Change identation in datagen.xml
Use database for the temporary  table script generation.
Merge branch 'integration' of https://github.com/codjo-sandbox/codjo-broadcast into integration
Format file.
[Oracle support] add transaction management to allow temporary tables with "On commit delete rows" strategy.
Merge pull request #4 from codjo-sandbox/integration

[Oracle support] - add transaction management to allow temporary tables with "On commit delete rows" strategy
change link color
add cursor
update
update
fix typo
update ansi-term color
update config
add create_external_dot_table_simplest.hive
Fixed Message.rb
Added throttling to 100 khz
Added vmloc-get for LOC_PICK
removed test code from vm.fs
Renamed 02_ci dir to ci
lingor config fix
continue trying to deal with cached files
Mark this repo as inactive

This is confusing to find as the first result on google. I think it will be best to redirect users to a known-active project.
Update README.md
Update README.md
Merge branch 'master' into devv
bug in js event handler
closest_city
nearest city
weather
ajout des regex pour binsearch
fixed bugs in crm, added enhancement after review with "customer"
make callback processing more robust by using thread pool
for testing use callback ports not constants
chroma subsampling
Fixing broken population script
Prepping Sporting KC
resolving merge
fixing merge issue
One possible way to reduce duplicate plot signs
Another hopeful fix
issue 922: refresh internal table info when a table was dropped and re-created
Part 3 Near Final
Merge branch 'master' of ssh://git@github.com/cs301w06/c301_project.git
trying again with assignments
Make active_state a member of caching_server_t

This variable is actually just a member of the caching_server_t object,
so it doesn't need to be a thread-local variable.
Rename egl_mutex to server_states_mutex
Collapse client_state and command_buffer

This simplifies the client-side a bit and makes it clearer what the
classes do. This comes with a rename from 'client_state' to 'client'.
grunt test now works. grunt default (ie build) converted. jshint config is in gruntfile now. just need to finish pages now.
didn't save all files in last commit...
add user head logo in index page
fix css issue
i have finally solved that fucking problem with the coordinates transfer
changing default value of alice.ip attritbute to 0.0.0.0
making alice standalone service optional via alice.run_standalone attribute
adding a locking mechanism to sql import
Submoduled Skeleton
Passing file reference directly instead of contents.
Kompilisieren vor'm Committen ist schlau xD
moving the git clones to a standard location relative to the image...so
smalltalk scripts can find them easily
More random prime changes
Minor updates
adeded
Merge branch '100-branch' of github.com:danielkzu/kzu-sandbox into 100-first

Conflicts:
	Readme.txt
add common filter to zero pad coordinates, fixes #141
add common filter to zero pad times, fixes #221
oops, should use <= not <
Merge pull request #252 from adamgreig/zero-padding-filters

Zero padding filters
fix incorrect type for payload field in payload_telemetry schema
fix #255: assumed all configs had sentences.

thanks @danielrichman for finding & fixing
Fix #256: incorrect use of couch

Need to use ["doc"] instead of ["value"] and must include_docs when using
linked documents.

thanks @danielrichman for finding and fixing.
Merge pull request #257 from adamgreig/fix-configs-in-flight

Fix configs in flight
fix #258: correct a typo and add a new stats collection
Merge pull request #259 from adamgreig/fix-stats-issues

fix #258: correct a typo and add a new stats collection
change view keys to fix view collation bug, impacts #253
oops, update tests appropriately
Merge pull request #261 from adamgreig/fix-view-collation-issue

change view keys to fix view collation bug, impacts #253
Update uploader to use new flights view
Use latest couch-named-python
Merge pull request #262 from danielrichman/update_cnp

Use latest couch-named-python
Merge pull request #263 from danielrichman/uploader_including_payloads

Update uploader to use new flights view
getting values
merging changes and adding command controll
make kernel version a parameter of makecd, eliminating hardcoded value
drop rootskel version number
Copied index to root to test gh-pages
postgres logging updates

Added place holders for the logging section and a query for real time
running queries.
made sencha model proxies restful. continued to work on renderer integrtion. adding swipe/taphold events to content list
fixes session creation problem
when insufficient points, cancel drag
formatting change in scoring
one many to one many with association class unit test working now that have removed PERSIST from CascadeTypes for 1 to many and 1 to 1..many relationships
Fixed some versions issues
Fixed appname in template
Get correct value for checkbox inputs in settings
ubiquo_design: Use current_locale only if ubiquo_i18n gem is registered
Create tabs after dom has loaded
Fix cloning widgets when having has_one relations
Use view handler extensions in partials is deprecated
Merge select filter url_for_options with params
Fixed checkbox settings value
Refactored validate_requirements for i18n conditions in different connectors
Some refactoring in Settings connectors
Now that bundler is always required on the Rakefile, the rescue approach is no longer needed
Fixed asset paths on authentification, categories, core, design, jobs and menus
Removed some repeated css with different format (closes #30)
Fixed bug in i18n connectors and some tests (closes #31)
Deleted unnecessary require in test
Added require for lockfile in cron jobs
Fixed ubiquo_form_builder tests
ubiquo_core should be able to launch tests without rake
Require bundler setup on Rakefile