labofsahil/github-event-dataset-2012 huggingface dataset:
Enhanced CCString with two 'constructors' and a compare function.
Moved from std::string to CCString *. Since the std::string utility methods in CCBReader were buggy on Android (for unknown reasons). Made string utility methods in CCBReader static. Android build now working equivalent to iOS build. *YAY*
Cleaned up public interface of CCNodeLoaderLibrary (now takes either const char * or CCString, instead of std::string).
ButtonTestLayer: Now showing the CCControlEvent information on screen. Fixed CCLOG -> CCLog (because CCLOG doesn't show up on Android.).
CCString: Added CCStringCompare operator (can be used i.e. in stl containers).
CCNodeLoaderLibrary: Now free from direct std::string usage.
CocosBuilderTest: Simplified the 'XYZLoader' classes to be header only, with nice and short macros to do the boilderplate stuff.
Added glue macros to reduce boilerplate code when implementing CCBSelectorResolver and CCBMemberVariableAssigner. Added LabelTest, MenuTest and SpriteTest.
Add gen/ and local.properties to gitignore
Create a library named cocos2dandroid

 * Based on sources from HelloWorld that should be common across all cocos2d-x android projects
 * Rename, use prefix cocos2dx_default_ for items in layout
 * Project files for android library, targeted to android-8
HelloWorld : Use cocos2dandroid library

 * Add library as a dependency for HelloWorld
 * Use cocos2dx_default_ resources
HelloWorld : Ant build file
HelloLua : Use cocos2dandroid library

 * Add reference to android library project
 * Remove code and resources that are now in a library
HelloLua : Ant build and configuration files
Tests : Use cocos2dandroid library

     * Remove code and resources that are now in a library
     * Add library as a dependency for HelloWorld
     * Use cocos2dx_default_ resources
Tests : Ant build project files
Android project generation script copies library sources

 * mkdir parent folder with project name
 * create android project in proj.android subfolder
 * copy library sources to generated project
 * remove unnecessary function that moves files from top directory to proj.android
Minimal layout directives in XML
Use Java code instead of XML to define layout

 * Android layout for cocos apps are very simple (full screen)
 * Avoids creation of R.java for loading the layout
 * Can package entire library in jar
 * Remove unused layout resource
Merge pull request #1030 from minggo/gles20

fixed #1292:fix some bugs that caused by modify function name
45
Merge commit '57d4112be5d27bf50339808c526df427b08e4cfc' into gh-pages
trim debug msgs
Modify type merge for boxed/unboxed select and case of having 3 types
Add a new regression test.
Finalset
Added Counter (sequence generator)
Added tests for shell command execution

(Missing files)
[#1084] Fixed up the checkFn bits with css. Now properly runs through a check function, if passed, and then tries to run it's callback
[#2219] Enabled the safe search feature of the flickr api
[#2168] Make the image editor awesome (once again)
[#2168] Update the image editor for some minor UI nits. Changed the photosetId of the plugin to accept a link or id
the move
apache2 -> apache text references
apache2 -> apache text references
Convert README to README.md
Convert CHANGES to HISTORY.md
MLN | updating readme
Correccion a ver reportes
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
DB
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
database
Merge branch 'master' of https://github.com/mlopeza/ofivi-ex
a few not so important changes
new try to bump version
Harshit & Duck | Ran findbugs and made required changes.
Harshit & Duck | Moving ActionData and ActionItem to a new module, so that they can be used both by drishti and clients.
Harshit | Deleting previous report actions before adding new ones.
Duck | EC registration upload XMLs created.
Handled ZeroDivisionError exception
Merge branch '168_thumbnails_no_geocode' of github.com:modilabs/formhub into 168_thumbnails_no_geocode
Added header and modifed css a couple of classes
css changes for nav spans and caret
Merge branch 'delform' of https://github.com/codcrazi/formhub into hexbin-legend
found where we need to insert hover code
Added new header and logo and modified css to reflect, removed ond header png
Color changes and new form button on header
Added rul to only use webmasks on dropdown icons
Fixed body and map canvas margins
upgrading to leaflet 0.4
change point addition to use leaflet 0.4 geoJSON api
merge
unbreaking functionality
Merge with master
Temporarily disabled "New Form" button until design is finalised
Moved compiled bootstrap.js file to main bootstrap dir
Added boostrap submodule into src dir and modified paths to css and js to match compiled custom bootstrap files
Updated Makefile to build screen.css and added screen.less, added comipiled bootstrap css and js, updated custom variables [ci skip]
hash of xml contents
xformlist according to openrosa FormListAPI
md5 hash of a metadata file
cascade select: convert input of  old method to new method
TST: Add some initial tests for from_sequence
[Ide] Need to initialize X and Y before using them to get the current monitor

Fixes bug #4559.
Fixed 'Bug 5012 - Public only assembly browser should not show private
namespaces'.
Fixed crash in container leak fix on Windows

The GLib.CDeclCallbackAttribute doesn't actually do anything
without the IL reprocessing step from the GTK# build. Use the
UnmangedFunctionPointerAttribute instead.
Fixed 'Bug 5830 - Extract method generates broken out parameters
instead of return values'.
[monomac] Update MonoMac to include the marshaling fixes
[NRefactory] Wrapping is now only done in intrusive mode.
[Ide] Fixed gtk warning.
[VersionControl] Re-enable log command for project folders

You should be able to view the log for a single file as well as for
a folder.
fixed expired
fixed Ninject container adapter factory implementation
don't send that many messages
fixed track message selection bug
Added option to lock a single axis
Added lockInContainer option
zamiana Sign In na Zaloguj i dodanie strony przekierowującej na info
Revert "Bug 807431 - [Phone] Final Ringtones Need to be Added to the Build"

This reverts commit abf38de550b65c23a4c16219a3da882201ffd88e.
Merge pull request #6857 from vingtetun/backout-ringtones

Revert "Bug 807431 - [Phone] Final Ringtones Need to be Added to the Bui...
Add a "template" app that other apps can be copy-pasted from, and can let folks do quick one-off debugging by editing it.
Update the window manager and add icon I missed.
Show non-Gaia app icons
Pass naked parseInt() to map() results NaN for some numbers
Merge upstream
Merge pull request #1599 from timdream/fix-for-demo

Show non-Gaia app icons
Merge pull request #1595 from cgjones/blank-app

Add a "template" app
Merge branch 'contacts-photo' of https://github.com/albertopq/gaia into albertopq-contacts-photo
Merge branch 'pickcrop2'
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
Add a small text block to the USB Mass Storage Settings

This allows us to tell the user that they need to unplug
the USB cable in order to complete disabling UMS.
Merge pull request #4992 from dhylands/dhylands-ums-unplug

Add a small text block to the USB Mass Storage Settings
Merge branch 'master' of git://github.com/mozilla-b2g/gaia
remove logging message accidentally left in the code
Merge pull request #5000 from davidflanagan/fixlint2

Fixlint2
Auto-merge from branch 'master'
Detect whether badNubmer or refused emgCall
fix popup height
in progress
in progress
deleted grey background with active icons
in progress
added missing images
lint free
PR suggestions applied
Used the asyncStorage to replace the localStorage
this is not this
Merge pull request #4363 from chrisvargauk/dialer-fix-no_sim_01

[dialer] fix: Emergency call if no sim
Further speed up user perceived boot speed by loading ScreenManager earlier
Merge pull request #4495 from crdlc/issue-3628

[Homescreen] Deleted highlighting icons on panning
Merge pull request #4556 from timdream/scm/this

When screen is turned off, correctly remove devicelight listener
Merge pull request #4485 from RayCheung/fmradio-asyncstorage

Used the asyncStorage to replace the localStorage
Auto-merge from branch 'master'
Permission check for background service
Support multiple background windows for apps
Handle mozbrowseropenwindow/mozbrowserclose
Remove getWindow function
don't clear the plural macro
Shame on me
Merge pull request #1784 from timdream/bgservice-windowopen

Allow apps to get the window object reference of their background service
Merge pull request #1786 from fabi1cazenave/l10n

don't clear the plural macro
patch for issue #2891. use single lock but multiple set for setting multiple key-values into mozSettings
rename set function
fix issue #2967.
update according to review feedback
Merge pull request #3036 from evelynhung/issue-2967

Patch for issue #2891 and fix issue #2967
Don't init() SettingsListener
Merge pull request #3381 from timdream/sms-settings-fix

Don't init() SettingsListener
Bug 814204 - call close() when app is forced close.
Merge pull request #6777 from yurenju/issue-814204

Bug 814204 - call close() when app is forced close.
Bug 800322 - Take the font test out
Merge pull request #5785 from alivedise/font-test-out

Bug 800322 - Take the font test out
Bug 811240 - [Status Bar] Hide status bar clock when device on lock screen
Merge pull request #6441 from ttaubert/statusbar/bug-811240-hide-clock-when-locked

Bug 811240 - [Status Bar] Hide status bar clock when device on lock screen, r=kaze
Fixing delete all in conversation list, when receiving a new message
we were not appending the new message to any thread.
Merge remote-tracking branch 'upstream_gaia/master' into feature-sms
Cancel tab creation if cancelling awesome screen (fixes #1956)
Merge pull request #2157 from albertopq/feature-sms

sms: Fixing delete all in thread view
Merge pull request #2158 from daleharvey/tab-fix

Cancel tab creation if cancelling awesome screen (fixes #1956)
Avoid using GAIA_PORT in webapps dirname in order to avoid having `:` in directory names
Use relative path for httpd@gaiamobile.org
Fix Makefile on windows
prepare fm app for design spec v7
containter -> container
freq-view -> frequency-view
fixed typo
fixed typo
Adding a pref required by httpd.js to the gaia profile.
Following up
Update status bar icons
Merge pull request #2746 from timdream/icons-png

Update status bar icons
Merge pull request #2666 from ochameau/win32

Makefile's Win32 support
Merge pull request #2670 from elektronikLexikon/master

[fm] visual v7
Merge pull request #2711 from etiennesegonzac/httpdjs-fix

Adding a pref required by httpd.js to the gaia profile.
Remove PEAR Mail
Move product ID from bango to generic (bug 817883)
add apt module
fix compilation error on base-4.5.0.0
optimize buchberger a bit
fix a bug of reduceGBase
add GHC-Prof-Options in .cabal
atomics cli
Added vim-blackboard colorscheme.
BUMP! (sorry for bunch-commit again. I still save no time to clean overlay and then do little one-feature commits)

Signed-off-by: Vadim A. Misbakh-Soloviov <mva@mva.name>
rm ore-mode.elc
Ignore devnotes file
Added Hashie to Gemfile as gem dependency.
Remove old gem version
v0.0.15 Web Insight API Call Added
Removed rspec as dependency and is only dev dependency now.
Require hashie for indifferent access to hashes.
Added Web Insight class to make get/post calls to PAPI.
Bumped gem version to 0.0.15
Updated README
MoveList.java commented
[010] Ongoing changes
can run
BOOST_VERSION
Streamline the conversion.

THis is like rearranging the dek charis on the Titantic.  THere's a
whole lot to be done about getting my funcs in the struct.. I need to
quit this.
Turn available_conversions into a map.

This kind of segregates the name from everything else, but it's all
internal so I guess I am ok.  This will facilitate the lookups I'm going
to need in a few minutes, too.
Gather up conversions.

Now the conversiosn to and from decimal representations define what a
representation is.  I think this is a win, but it would have bene a
bigger one if I hadn't already written all ofthe formats in which I am
interested.
setup i vs j problem
Add coordinate descent method
style-ie.css
ticket:5 added login_redirect_url
Signed-off-by: Mykola Yaremov <n.yaremov@gmail.com>
ds
Merge branch 'develop'
sfsd
add addon-sdk submodule
add menuitems and vold-utils submodules
update b2g support in mozdownload per reviewer comments
update menuitems submodule to version with bustage fixes
merge submodule menuitems upstream
point to my fork of menuitems submodule to ensure it always works for the superproject
add 'Launch B2G menuitem to Tools > Developer Tools menu
Try to fix caching bug
fixed issue with cli opts when enabling use strict
日本語やめましょう
Merge branch 'master' of github.com:myun2/roast_work
Removed superflous file
Added range checking to DiceRoll
added a new struct called config_rom
-- yet to fully implement it
change the setup job to grab yahoo credentials
-Adding A Star shortest path template and test implementation
First version
add node_modules to .gitignore
add package.json
delete trash
Fix filters by integer values

don't generate overall if get only one row
bump version to 0.9.0-wip10
Fix TransactionalTopologyBuilder NPE
updated changelog
Turris tested again
Player "Show game stats" lengthed to say "and check description of active cards"
blocks: adds new top-level component gr-blocks with first block
	gr::blocks::add_XX
blocks: added blocks_add_const_xx
blocks: fix XML file in previous commit
blocks: copy alignment fix from maint
Merge commit 'v3.6.1' into wip/gr-blocks-master
blocks: added multiply_xx, some cleanup on add_xx
blocks: completed transition of add and multiply blocks

* gr::blocks::add_*
* gr::blocks::add_const_*
* gr::blocks::add_const_v*
* gr::blocks::multiply_*
* gr::blocks::multiply_const_*
* gr::blocks::multiply_const_v*

Each of these has ss, ii, ff, and cc versions, for a total of
24 blocks.
blocks: added div_XX and sub_XX blocks
blocks: added gr::blocks::char_to_float
Merge branch 'master' into wip/gr-blocks-master
Merge branch 'master' into wip/gr-blocks-master
blocks: added gr::blocks:char_to_short
Merge branch 'master' into wip/gr-blocks-master
blocks: added gr::blocks::complex_to_interleaved_short
blocks: added gr::blocks::complex_to_float
blocks: added gr::blocks::complex_to_real
blocks: added gr::blocks::complex_to_imag
blocks: added gr::blocks::complex_to_mag
blocks: added gr::blocks::complex_to_mag_squared
blocks: added gr::blocks::complex_to_arg
gr_fxpt.c : Remove unused code.

The code in the #if 0 block is in the header file. Remove this section to
avoid confusing people trying to figure out what this does.

Signed-off-by: Philip Balister <philip@opensdr.com>
gr_fxpt : Add sincos function to class.

Signed-off-by: Philip Balister <philip@opensdr.com>
qa_gr_fxpt : Remove debugging cout.

Signed-off-by: Philip Balister <philip@opensdr.com>
gr_frequency_modulator_f : Convert from using libm sin/cos, to gr_fxpt sin/cos.

Signed-off-by: Philip Balister <philip@opensdr.com>
grc: resolve down and up stream for empty types
build: properly handle the VM circbuf; was forcing tmp file usage on all platforms.
Merge branch 'master' into next
trellis: bug fix to make sure file is closed.
core: use while instead of if in frequency_modulator

* It is possible to wrap multiple times in a single update if the
  sensitivity parameter is high enough.
core: loosen fm modulator QA to 5 decimal places of agreement
core: makes sure all block's buffers are aligned on start/restart and that they know it.
trellis: bug fix to make sure file is closed.
Merge branch 'maint'
Merge branch 'master' into next
core: buffer alignments were getting confused. Just need to tell all blocks that they are aligned upon restart.
Merge branch 'maint'
Merge branch 'master' into next
Merge branch 'wfm_tx_work'
Merge branch 'master' into next
gruel and howto: install gruel .i files in gruel dest. Howto will use that dir during build.

howto under both cmake and autotools can be built off cmake or autotools gnuradio builds.
ctrlport: fix in cmake for OSX builds of ctrlport.
core: updated the message debug block to have a 'store' port where messages can be retrieved afterwards.

Updated qa_pdu to use the new 'store' port for testing the resulting message.
Merge branch 'master' into next
core: Adding function to retrieve the symbol names of a blocks message ports.

Updated qa_pdu tests to verify this.
Merge branch 'master' into next
core: added gr_tuntap_pdu, gr_socket_pdu, and msg passing enhancements
Merge branch 'master' into next

Conflicts:
	gnuradio-core/src/lib/runtime/gr_basic_block.h
core: fix missing gr_basic_block variable after merge fixup
Vimeo support, updated to 0.0.2
uri: Fix wrong 'array zero-terminated=1' annotation for strings
improved link finder
Updated logs enum a bit
work on word tokenizer and sentence length calculator
top off with test
Properly handles relative symlinks to this script. e.g. /usr/local/bin/play -> ../play/2.0.1/bin/play
Fixed categorization and tagging of events
Set encoding=utf-8 to get utf-8 files in gVim.
StandardizedPatient Bug Fix.
dont show deleted updates
Added request for login & password in client
Add check for ship placement correctness to client
Merge branch 'master' of github.com:bakwc/SeaCraft
MINOR Docs mention of automatic master lang uploads
MINOR Fixing broken test on Windows
BUGFIX Ensure MySQLi is used consistently in MySQLDatabaseConfigurationHelper, not old mysql functions
FEATURE: add Levelup component to GridField as GridFieldLevelup
API CHANGE Deprecated internal access to SQLQuery properties, update core code to reflect these changes.
Using set/add instead in accessor methods, and use Database::sql*ToString() to allow easier per-database adapter SQL overloading.
APICHANGE: PasswordEncryptor::check() allows for more powerful password checking, deprecating PasswordEncryptor::compare()
ENHANCEMENT: Use the best blowfish encryption available - this fixes fragility between PHP versions and system installations
BUGFIX: Increase size of varchar fields on MemberPassword to match those defined in Member. This fixes issues when the password hash is longer than 50 characters, and was being truncated when saved in MemberPassword.
Merge pull request #400 from halkyon/sqlquery_enhancements

API CHANGE Deprecated internal access to SQLQuery properties
Merge pull request #408 from ajoneil/blowfish

Fix blowfish encryption
Merge pull request #407 from normann/trac/7173

trac 7173, Add "level up" list entry to CMS page list view
Merge branch 'master', remote-tracking branch 'upstream/master'
[media] s5k4ca: Do not allow applying a configuration that is unsuitable for current streaming mode.
[media] s5k4ca: Force applying configuration after streaming mode change.
[media] s5k4ca: Report capture mode enable errors.
[media] s5k4ca: Remove unnecessary condition.
[media] s5k4ca: Fix frame rate configuration requests.
[media] s5k4ca: Do not reconfigure preview video mode for incompatible modes in respective requests.
[media] s5k4ca: Use correct condition for checking compatibility of video mode.
Merge remote-tracking branch 'android-s3c64xx/android-s3c64xx' into android-s3c64xx
Work on deb
Removed EasyLightBox.
Added .gitignore.
Amend header file.
Remove media.phtml from gogomart package.
job must be rerunnable
Add social links, improve homepage (minor).
p2 user update added modified timestamp change
p4 Proposal Site Complete
Added setup instructions, edit over earlier pull request.
more tb2 tweaks, big change, make permissions=True default for CRUDL objects
link to Wiki should be enough for "Weiter Infos"
cleanup: massively auto-rename functions

random_addr -> single_replace
cached_addr -> single_replace_cached
replace -> multi_replace
replace_cached -> multi_replace_cached
cleanup: sort out single vs multi replacements
add URL parser, DNS, other improvements
micro fixes
started NewStory
added glitcher system and several effects
Ignore Iron.io config
implement score submission and saving
implemented time input view
Make GC clicks load the right record
Password reset wording
User list loads pane 3
App launcher: only one app per icon
Unzoom on body click
added partner listing
Merge branch 'master' of https://github.com/olavgg/response3
Net::LDAP Connector - initial implementation

The idea of this Connector is, to get the attributes of an LDAP node as
hash. The the attribute names are mapped to the hash keys using a configurable
map.
The code is just an idea has never been tested!
Add Log4Perl logger
Refactoring of the LDAP connector

The base class does no longer provide any external methods.

LDAP::Simple feature set/get of scalar values from one attribute
LDAP::Single provides get_hash to get multiple attributes from one entry
   set can also set multiple attributes at once.
LDAP::DN provides get_list to find the DNs using non unique filters and
   offers the ability to delete a ldap entry
Updated the style of user's books page

Changed the position of the "New Book" button
Added color labels to according to book status
Changed the actions buttons to a button group
Return books listed by finished date DESC.
Fix another death knight lua error.
Version 4.44
Uhh this isnt what I intended.
Version 4.45
If an error occurs while loading an ElvUI module it should no longer break other modules. For example a unitframe error will no longer cause the chat not to load just because the unitframes got loaded first.
Fix a lua error when sorting bags containing a pet inside a cage.
Fix a lua error inside pets journal skin.
Version 4.46
accidently reversed a change
Version 4.47
Merge remote-tracking branch 'remotes/ElvUI/master' 4.47

Conflicts:
	ElvUI/ElvUI.toc
*fixed tiny mce styles
GDA-5397 fix run configuration issues with example-config
Cheetah.run refactoring: Extract the "compute_streamed" method
Cheetah.run refactoring: Extract the "build_streams" method
Cheetah.run refactoring: Extract the "build_commands" method
Cheetah.run refactoring: Extract the "format_input_output" method
Cheetah.run refactoring: Extract logging code
Cheetah.run refactoring: Refactor the "fork_commands" method
Cheetah.run refactoring: Extract the "select_loop" method
Cheetah.run refactoring: Extract the "handle_errors" method
Cheetah.run refactoring: Extract the "build_result" method
Cheetah.run refactoring: Group statements better
Cheetah.run refactoring: Mark private method categories by comments
Add CMake option to disable libproxy usage and disable it on SLE. (bnc#752500)
changes 9.11.11 (8)
Use skip and offset in pagination instead of array slicing
Fix simple db image_get to look like sqlalchemy

image_get in simple db was repeating logic that exists in helper
is_image_visible method. Also, sqlalchemy implements the same way, so
now this method behaves in both dbs.

Fixes bug 1077256

Change-Id: I5285027a24157750d7c322990aa4074e2b1087c7
Merge "Fix simple db image_get to look like sqlalchemy"
DocumentsItemPart works now via Requester
force update names
Update api menu to reflect user authorization and allow customization on view for each page.

Signed-off-by: crynobone <crynobone@gmail.com>
Fix gpx utilties to log exception
Enhance list scrolling
update d chart
added script for replacement relative urls to absolute in string
Update styles/selider.css

cursor edited as pointer for the selected item
maximize works only on firefox
Allow for sync without creating a new folder.
Edu tragalo
initial commit (w/ files)
Merge pull request #65 from parafas/master

translation - Portuguese Brazilian
Merge pull request #66 from parafas/master

translation - Portuguese / Firesale_search and Firesale_shipping
Adding a cart_updated event
WYSIWYG fields had their classes removed by JS

All WYSIWYG fields in the products admin had their "input" class removed
from the div which caused presentation issues in the admin.
Final style changes to admin Closes #72
Removed array_reverse function

The tabs no longer need to be reversed so I'm removing the function to
reverse the array.
Forcing the section to "dashboard"

Forcing the section to "dashboard" on the dashboard page.
Updating readme with info on rerouting dashboard
Fixed slug issue for special characters
No longer tries to save blank categories
Closes issue #74
Adding redirect to FireSALE dashboard

If the route to replace the PyroCMS dashboard with the FireSALE one is
added then it will redirect to the FireSALE dashboard.
Updated the cookie functions to use CodeIgniter

The cookie functions in categories were not using CodeIgniter's cookie
functions. They are now.
Small gateway updated
Another few gateway updates (small ones)
Closes issue #64
Closes issue #63
That should probably be escaped
That should be escaped too
Security fixes!
need cairo-32bit as dep
grub2-editor
parser can now handle anything you throw at it (except for the weird Python 2.x UTF8 errors, that'll be next)
Merge branch 'develop' of https://github.com/parklab/Refinery into develop
forgot to add in the functionality to rollback an investigation that has errors
Base code for adding bootbox to updated IGV code
Merge branch 'develop' of github.com:parklab/Refinery into develop

Conflicts:
	refinery/templates/data_set_manager/contents.html
Business logic updates
embed generation for Vimeo
Restrict translation versions based on member perms, etc.
Merge branch 'dev' of github.com:pculture/unisubs into dev
Some work on the new Embedder.
another try on advanced search on jenks
Allow setting of title/description for versions
Update integration repo
Document 'completed' field on Task resource
fixing a few empty folder issues & filling install instructions in README
switch replication host to the iriscouch instance
TEST: BF utils better handling of float lists in compareTextFiles()

reveals similar bug in compareXlsxFiles, not solved by np.allclose()
TESTS: BF compareXlsxFile

intercept lists-of-floats and allow close rather than exact match
Merge pull request #197 from jeremygray/master

tweaks to tests for lists of floats
BF: use csv files as output from Builder experiments (not dlm)
DOCS: updated version and changelog

Also changed OSX setupApp script:
	- removed nose because no longer used
	- temporarily(?) removed psignifit because doesn't work with py2.7
BF: don't raise a warning if no known compatibility issues
BF: second attempt to force Experiment class to output csv instead of dlm files
ENH: new experiments won't save excel files or loop-based psydat files

From now on, the default for new experiments is 1 log file,
1 csv (wide) file and 1 psydat (ExperimentHandler)
DOC: bumped version number for release 1.75.00
BF: problem with sounds in Builder when the sound had infinite duration
Merge branch 'master' of github.com:peircej/psychopy

Conflicts:
	psychopy/data.py
Another fix for ELFLOADER
MONDRIAN-1311 - AutoGeneratedDate tests would fail sporadically because of soft references in a Map.  Have to clear all db information at the start of each test.
A slightly better code path.
Backup game saves from windows.
Removes debug prints and bumps the version
creating package for drawing style forms
adding draw inner part / border of polygon editing controls
using draw inner part/border properties in renderer
adding list hepls watch draw priority
adding residential area
adding building
adding trunk
To rename folder using case sensitive phase 1/2
documentation 1st version
Moved omniauth-twitter at the bottom of gemfile
Removed version listing in file
Added documentation to Module
Version
'insulin day' works
- added dock
- switched from points to a closed polygon geometry rep.
a semi-working version
the first semi working version
ignore ConstraintViolationException when setting properties in Doctrine\ODM\PHPCR\UnitOfWOrk::executeUpdates()
added code to parse port number in url, updated url_scheme extraction, added more comments
morphia refactor
MorphiaDatasourceImpl mapped classes as a spring property
modified:   README.md
	new file:   costmax.jpg
	new file:   costmax2.jpg
added example to codebase and README
a minor fix on doc
merged value set changes from sam
changed QME to point back to develop
Spatial Adapter added to ActiveRecord
Added commandline app in bin/

Using Terminator gem.
Check validity done.
Fix layout height; update error pages style
bump version number to 0.6.42
Merge branch 'release/0.6.42' into develop
add css for special marketing but not complete
change some html fro marketing & special marketing
change menu ok
change zepto for menu ok
修改图片地址为绝对地址
update abstract, section 1 and section 2.
Add missing includes
Merge pull request #2 from FlorianFieber/upstream

Add missing includes
Added bind mode indication led to the spektrum radio system driver.
Added analogue and digital path reset to aspirin2 driver.
Changed calibration values for asp21
Changed IMU to Body orientation for Lisa/L
Reverted IMU startup delay to 4000000 cycles.
psyq::event_action::update関数に、任意の引数を渡せるようにした。
cameraの設定に失敗した場合は、cameraを変更しないようにした。
Update fr/core-libraries/components/access-control-lists.rst

Correction of a shell
Added error output to Starbucks sample.
fixed error
optimization only possible when lapack is there
Merge pull request #635 from karlnapf/master

fix for LAPACK compile error
Fixed MKL training double free
fixed some bugs
Merge pull request #636 from gsomix/trace_mallocs

Fixed some bugs in CMap
Fixed num steps computation of model selection
Made feature block logistic regression outputs use sigmoid
added optimization of combined kernel weights
added example for combined kernel weights optimization
Merge pull request #637 from karlnapf/master

optimization for kernel weights with libqp for linear time mmd
Merge remote branch 'upstream/master'

Conflicts:
	src/shogun/lib/Map.h
remove merge issues
add api
simplified test targets
Ultimos cambios para que compile el proyecto.
install powerline for vim as a submodule
playlist moved to snippet
Added in the Ipsum Project
dokonfigurowanie devise
zmieniamy cudzysłowia
keep extent of overview set to union of extents of layer in overview; dont shrink on resize; fixes #1788
make attribute table and identify consistent with map canvas
fixes #6228 (I think definitely)
Merge pull request #348 from slarosa/sextante-issue

fixes #6228 (slarosa think definitely, and so do I :))
实现FBReader第一次打开的界面改为空白页
保存屏幕刷新数据
test md link
Fix "Too many open files" error by using proper free function.
Add support for *new* EPiServer's default hashes.
RAR: Re-introduce find_best_kpc() - only used when specifically saying KPC=0
Merge branch 'xsha512_tomagnum' of https://github.com/qqldd/magnum-jumbo into magnum-jumbo
Minor cosmetic fixes.
Add few more self-tests in episerver format.
Implement proper set_salt and get_salt functions in episerver format.
Add speculative support for salted SHA256 hashes in episerver format.
Fix a silly typo.
Office 2010 support is now complete.
Implement proper get_salt and set_salt functions in office format.
Add OMP support in office format.
Warning for opencl_MSCASH2_fmt.c muted
sapB optimisations and sap2john overhaul
Add grant: none to greasemonkey meta

Also compact match rules since I can
Change build filename to something simpler
Fix matchesSelector hack

With a monkey patch, but it's a polyfill so it's okay
Add (unused) DOM4 mutation methods polyfill

so veddy cool
Fix debounce call -> apply

so embarassing :(
Ignore new built javascript file
Clean up whitespace in utils.co
Restore missing whitespace between elements

whoops.
Rewrite youtube.co with new syntax

I was hoping to either do the batch fetching, or somehow hack around
firefox's non-updating title attribute, but neither was fruitful :(
Revamp inlinereplies.co a bit

More modern coding style, use DOM4 stuff, no more outerHTML
Revamp postpreviews.co
imgpreviews.co tabs -> spaces

Also cleaned up some wordy comments
Reindent and revamp imgexpansion.co
Post.co tabs -> spaces

I thought I had them all ;_;

also fix stupid bug in imgexpansion. I really wish Gcommit --amend
was cancelable.
Revamp onready with new syntax and techniques

Was being way to clever with the captcha thing, even though all the
info was already there. All I needed to do was recall _finish_widget;
Parser tabs -> spaces and cleanup

Neat trick with Array::map and this context to avoid creating an
extra closure, if that helps anything.
hide tabs -> spaces

Too lazy to improve anything
Remove useless comments from highlight.co
Trim trailing whitespace
Remove old DOM mutation tools in favor of DOM4
working on async_start
Added client core upgrade script.
Merge remote-tracking branch 'homedir/master'
Commented OSX git config for helper.
add userinfo

Signed-off-by: 525846028 <525846028@qq.com>
Uninstall node-brackets NPM
Added node-brackets Git submodule
Fix sonar issues
Merge branch 'daley', remote-tracking branch 'origin'
Fix sonar issues.
Merge pull request #357 from rackspace/fran

Fix sonar issues.
Install 'trusting' ssl context into connection manager registry
Merge branch 'daley', remote-tracking branch 'origin'
Add uri regex jmeter test
Merge branch 'master' of github.com:rackspace/repose
architecture chapter finished
otro
Merge branch 'new'
and resolved the conflicts

Conflicts:
	log.roo
missed-out changes got added.
changed group and app fqins to match those of tags
move the problem note after it will occur (not during rvm installation)
update rvm version
just link to the separate page since these duplicate instructions are outdated
rename install_rvm to install_rvm_and_ruby since some students were confused and skipped the install ruby step sincde they knew they already had rvm
followed Alex Chaffee's advice and made the autoreconf message into warnings so they stand out more
clearer solution to autoreconf problem
Updated references to older rails version to avoid confusion.
More (really) old Rails version references.
Fixed broken repo links
Updating git version
Make sure students source jQuery before their JS.

Saw someone going through the material on their own get an error because
they had the jQuery script tag after their resources/javascript.js tag.
Add list of design resources to frontend wrap-up.
added warning about the scary instruction page that comes up when you install your first ruby with rvm
Merge pull request #74 from rearadmiral/master

add warnings for autoreconf on ubuntu and mac
HTML release
HTML release
HTML release
remove simplejdbc to persist,binding to webwind
시간을 타이머를 이용하여 일정한 간격으로 갱신되게 만듬
Uh... ignore that.
zf2-rc4 fix
Merge pull request #44 from bate/master

fixed issue #43
General refactoring of AbstractDbMapper for consistency and protection of mapper-related functions (BC breaking!)
all database operations should initialize first
delete does not need a hydrator
adding get table name method, and tablename local member

Conflicts:
	src/ZfcBase/Mapper/AbstractDbMapper.php
Merge pull request #49 from bjyoungblood/feature/abstract-db-mapper-refactor

Refactor AbstractDbMapper
bug fix ($this->sql instead of $sql)
Merge pull request #50 from bjyoungblood/hotfix/db-mapper

bug fix ($this->sql instead of $sql)
Move tests directory to test (singular
chmod gmock
Fixed default index format
fixing a bug in the fix hooks method
converting to cedar
* Changed license from GPL v3 to AGPL version 3 or later.
* Removed the namespace 'hunchentoot' from the calls.
style correction pour Geekcloud &copy; - 2012
commit de imagenes para que git status funcione decentemente
Windows changes. Add handlers for CTRL-C, CTRL-Break, CLOSE, SHUTDOWN and LOGOFF

git-svn-id: svn://svn.hercules-390.org/hercules/trunk@5703 969364d3-6d58-4e41-9446-b7e21338ea1b

Conflicts:

	CHANGES
	hao.c
	hdl.c
	hscmisc.c
	msgenu.h
Dynamically add instructions

git-svn-id: svn://svn.hercules-390.org/hercules/trunk@5865 969364d3-6d58-4e41-9446-b7e21338ea1b
Include opcode.h in hdl.c so that the opcode tables are visible

git-svn-id: svn://svn.hercules-390.org/hercules/trunk@5871 969364d3-6d58-4e41-9446-b7e21338ea1b
temp fix to hdl.c for affected targets (backlink problem)

git-svn-id: svn://svn.hercules-390.org/hercules/trunk@5880 969364d3-6d58-4e41-9446-b7e21338ea1b

Conflicts:

	hdl.c
Fix bypass

git-svn-id: svn://svn.hercules-390.org/hercules/trunk@5882 969364d3-6d58-4e41-9446-b7e21338ea1b
APPLE misspelled..

git-svn-id: svn://svn.hercules-390.org/hercules/trunk@5885 969364d3-6d58-4e41-9446-b7e21338ea1b
completed the basic README
Update README_FIRST.txt

sks
edited some css, updated modules, reinstalled ckeditor
fixed ie gradient filter rendering overflow bug - fuck ie
redump
added research partner styling in footer
added features module
edited style (pixtoem and golden ratio type) plus content
installed, activated and styled Follow and Twitter modules
styled partners, added some logos
Make the member login string translatable
(TEMP) chat_spec.rb
Check the token type before deleting the newline
Added functionality to update work logs in closed JIRA tickets without reopening and closing the ticket.
Added a config setting in order to enable this: closed_issue_editable (defaults to false).
Added moonwalking. Just a shift key test, I swear.
Use without_protection automatically when created_at, updated_at and id are dumped.
Made the center catwalks a bit thicker in Phosphorus, and made a half-hearted attempt at getting the hull models to appear.
Include sqlalchemy requirement (for SQLDB)
Correct inheritance
Don't use global metadata as it makes testing more difficult
Include SQLDB
rhoelements/wm: geolocation & authentication webkit callbacks added
Fixed minor issues added livence text
HttpServerRequest.hasReceivedBody
Commit in local repository.
All Xml2TeX java code, with JavaDoc documentation
Bugfix: get keys of map[string][]byte
Pushing for janky server funtimes
Merge branch 'attack' of https://github.com/rit-sse/rapdev12 into attack
Merge branch 'server-comm' into client-upload
Merge branch 'client' into client-upload
Merge branch 'server-comm' into client-upload
Merge branch 'client' into client-upload
Move duplicate JS imports out of layout.jade and move an import to index.jade
Merge branch 'server-comm' into client-upload
added file submission on index.jade
Merge branch 'client-upload' of https://github.com/rit-sse/rapdev12 into client-upload
Merge branch 'master' into client-upload
Merge branch 'client' into client-upload
sim moved to tests and renamed

./sim moved into ./tests and renamed to comm
Merge branch 'client' into client-upload
Merge branch 'server-comm' into client-upload
Readying the server almost done. Getting close to testing.
updated inheritance structure
12-09-09_mccartan_cory

Changed cannon fire to getRawButton() because this is one scenario where
a debounced button is too fast and wouldn't allow the cannon to fire
properly.
Merge pull request #1 from robotpony/master

Merged documentation changes from public project.
Merge pull request #2 from robotpony/master

Additional documentation changes.
Added an alias for the update function.
Merge branch 'master' of github.com:Discovery-Software/Presto
The bound_parameters array is now keyed meaningfully and this function expects a 'value' and a 'pdoType'. We also use the PDO::Statement bindValue function for binding as it will take a value where bindParam was only usefull for references.
Updated README, clarifying.
Project cleanup.
Merge branch 'master' of github.com:Discovery-Software/Presto
Edited readme/install docs, adding detail and clarifying.
Merge pull request #3 from Discovery-Software/master

Merged upstream documentation improvements.
Added Session basics
Fixing the styling on long result lists.
Replace find-if-not with loop

Fixes the compilation warning about using the cl package at runtime.
Fix typo on ConnectionValidator extension docs

avialable -> available
Merge branch 'master' of https://github.com/rowanborder/xbmc

Conflicts:
	system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml

Signed-off-by: Rowan Border <rowanjborder@gmail.com>
Merge branch 'master' of https://github.com/rowanborder/xbmc

Conflicts:
	system/keymaps/joystick.Microsoft.Xbox.360.Controller.xml
Add NamedColor() function to lookup color by name or hex string.
Remove test helper expect from objects_test.go. Use expectS instead.
Add string delimiters to error message.
Implement basics of font selection, excluding font metrics.
Continued work on works image browser
Visually merge a plugin with its update notice. Same applies to themes in the network admin. Move from 'update automatically' to 'update now'. fixes #20273.



git-svn-id: http://core.svn.wordpress.org/trunk@20236 1a063a9b-81f0-0310-95a4-ce76da25c4cd
Remove soundtouch version 1.6.0 or gt.

Signed-off-by: Horváth Balázs <qqroach@riftworks.org>
Added Concept Inventory Questions in Calculus
Merge branch 'master' of github.com:rpruim/PREP-2012
login authen ,twitter bootstrap and pg constraints...
WIP unix execute_command and better build error reporting.
Add the All_Defs and All_Uses Coverage Criteria Algorithms.
revising classpath for byteman.
fmartins
removing extra byteman jars.
fmartins
classpath properties.
fmartins
java 1.6
fmartins
lib is not an output folder.
fmartins
updating dependencies build.xml
fmartins
java 1.6
fmartins
Merge remote-tracking branch 'origin/v.0.4' into v.0.4
update
tools: build.py: fixup spacing to use 4 spaces

4 spaces is the python standard. Use it. Right now we have a mix of 2
and 4 spaces :(
luvit.gyp: add -g flag to luajit

with -g we get line numbers in tracebacks. This is very useful and
should be on by default.
Merge pull request #204 from luvit/add-debug-info-to-luajit

luvit.gyp: add -g flag to luajit
Merge pull request #202 from luvit/standardize-build.py-spacing

tools: build.py: fixup spacing to use 4 spaces
removed muse mode
Merge branch 'master' of github.com:russell/dotfiles
mod 10b
Discussing security
Update zfs-install

Include command to download latest stage3 tarball.
Update swap instructions
Update ARC Tuning to reflect that genkernel supports this now.
Fix some comments.
Add a segue from the PscyologistViewController to the HappinessViewController and add an identifier for the segue.
Call performSequeWithIdentifier
Implement prepareForSegue.
renamed readme.rst to README to meet sdist expectations
A little bit of performance enhancement in EMCCAlgorithm.cpp.
Update README.md

Corrected reviewboard config HOWTO.
RESTRUCT refactor moka_call_handler unit tests
FUNCT delete moka_server:set_response_fun

It didn't make sense to create a call_handler without a function set
Add mami

https://gist.github.com/3713132
autotools: Fix git version
added names to the bundles and cassandra-all poms
adding namespaces : minor
place nodes for parsing nets
info to debug
Added create_place
which creates a cmd from string
which will then be parsed through new__instance
removed client.py and example.py from this project
Starting to think about how to actually distribute this thing.
Force tmux 256 color support + updated theme
Schönere Lösung für Table Headers
LoanDetail Methode gekürzt
Fully functioning

Allows for user's input and saves it to an sqlite database
upgraded test system & gems
added tests for logstash output
Added splunkstorm output
let the outputs handle thread safety

the default ruby logger is already thread safe
generate helpers methods
version bump

added changelog
added splunkstorm example
Set guifont to Ubuntu Mono 12 on Linux
updating maav_base,3
Adding Mac target template.
wip for Reverse Search
add TODOs in README
add classExamactivityRequest for teacher
Avance en notificaciones, solo queda hacer que no se repitan y optimizarlas
ticket:1 fix app name
ticket:1 fix models field
ticket:1 fix views
ticket:1 fix base.html
ticket:1 fix tests
ticket:1 deleted mytest/ticket
ticket:1 add admin site
add admin url, fixtures, fix admin.py,
ticket:1 fix templates
ticket:1 fix urls
ticket:1 fix urls
ticket:1 add south, fix settigs, requirements.txt
ticket:1 add migrations
ticket:3 fix conflicts t1_contact -> t3_middleware
create template, fix url
The first step to sortable sections in new document form
Drag & drop between frames
added readme, cause github said i should
Revert "Revert "Update src/modules/nomisma/nomisma.js""

This reverts commit 9ea3b23a9588ca1914fd4b18aad030a90688afa1.
Revert "Revert "Revert "Update src/modules/nomisma/nomisma.js"""

This reverts commit 1d1cecde1c0e0538c834a719aa287299e11a2966.
Basic initial JS for left menu on style guide
Initial setup of updates to Firefox Central page (Bug 744918)
Build out more of Central page for Bug 744918
Build out the rest of the updated Central page (Bug 744918)
Less whitespace in speedometer image (Bug 744918)
fix OSX typo and other tweaks
Use proper url helper for internal links (Bug 744918)
Fix wording on /centra/ page (Bug 744918)
Adding Graphic Design option to drop down form (and re-arrange other form elements) for Bug 747511
Initial template setup for Apps Partners page
Add content and images for new partners page
Fixing path to .mp4 version of video -- bug 748035
Merge pull request #69 from davidwboswell/patch-4

Fixing path to .mp4 version of video -- bug 748035
Merge pull request #67 from davidwboswell/patch-3

Adding Graphic Design option to drop down form (and re-arrange other for...
Merge remote branch 'mozilla/master'
Merge pull request #66 from sgarrity/bug-744918

Bug 744918 - Implement updated /Central Page
Merge remote branch 'mozilla/master'
improve code for pulling the latest version out of product-details
update product-details
fix apps marketplace newsletter (bug 748697)
Video thumbnails, font updates for Apps Partners page
Updates to work with Windows authentication
In relobj(), call setmnotwielded() if preparing to drop a monster's weapon; this was lost in setmnotwielded() both because the monster was dead. This allows Sunsword to stop glowing properly when its wielder is killed, fixing C343-106.
initial commit
Merge branch 'master' of github.com:shancat/Qt-Hello
add ViewPager demo
バージョン変更

git-svn-id: http://nasserver:888/repos/main/platform/Titanium/Tumbdash@2394 fd21481f-4f5f-b64a-a7cc-914020ce4b36
SDKのバージョンを変更

git-svn-id: http://nasserver:888/repos/main/platform/Titanium/Tumbdash@2395 fd21481f-4f5f-b64a-a7cc-914020ce4b36
removed body's left margin so the navigation spans the entire top of the page
Updated code for 2.1 b12: com.sun.javafx.css.Value was replaced by com.sun.javafx.css.ParsedValue.  Also fixed the paint caching which wasn't being utilized.
Merge branch 'develop' of https://github.com/tschulte/groovyfx into shemnon-develop
fullscreen tweaks on colorful circles
Merge branch 'develop' of git://github.com/groovyfx-project/groovyfx into shemnon-develop
Merge branch 'develop' of git://github.com/groovyfx-project/groovyfx into shemnon-develop
Merge branch 'develop' of git://github.com/groovyfx-project/groovyfx into shemnon-develop

Conflicts:
	groovyfx/src/demo/groovy/ColorfulCirclesDemo.groovy
out of order position changes
Merge branch 'develop' of git://github.com/groovyfx-project/groovyfx into shemnon-develop

Conflicts:
	src/demo/groovy/ColorfulCirclesDemo.groovy
merge
merge
ember fixes
More template updating added, custom simple_form input wrapper - check for that. Also update your db - added subject column to db in latest migration.
modifying makefile for windows
makefile for windows correction step2
indirect new post get
update files for error