labofsahil/github-event-dataset-2012 huggingface dataset:
fix link in postinstall message
ubuntu rules: remove old sqlite workaround and add new one for contexify
use new tags of node-mapnik, tilelive, tilelive-mapnik, node-mbtiles, and millstone
Merge branch 'master' of github.com:mapbox/tilemill
added Gatekeeper mention to changelog
Merge branch 'master' of github.com:mapbox/tilemill
windows packaging tweaks
bump windows installer version
use latest tilelive-mapnik
Merge branch 'master' of github.com:mapbox/tilemill
reveal new osx dev build: 0.9.1.276
Renamed renderWithRecent to render
AppStates.js cleanup - for getStates() function, remove 2nd parameter
"associative" which is no longer used anywhere in the code.
Merge branch 'master' of github.com:maqetta/maqetta
fix #3250 - tab bar doesn't work in sketch mode
Test
Signed-off-by: 397152971 <397152971@qq.com>
去掉test
Signed-off-by: 397152971 <397152971@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
修改配送线路信息--王艺荣
Signed-off-by: 397152971 <397152971@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git

Conflicts:
	code/Authority/Wms/Web.config

Signed-off-by: 397152971 <397152971@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
清理；
帮助信息
Signed-off-by: 397152971 <397152971@qq.com>
Merge branch 'master' of https://github.com/THOK-SW/wms_rfid.git
Merge branch 'master' of git://github.com/397152971/wms_rfid.git

Conflicts:
	code/Authority/THOK.Authority.Bll/Interfaces/IHelpContentService.cs
	code/Authority/THOK.Authority.Bll/Service/HelpContentService.cs
	code/Authority/Wms/Wms.csproj

Signed-off-by: Endis <369029432@qq.com>
参数设置（提示：数据库有改动）
Signed-off-by: name07 <122419795@qq.com>
帮助主页--杨启辉
Signed-off-by: unknown <Administrator@.(none)>
bug test
Signed-off-by: Endis <369029432@qq.com>
帮助主页 帮助信息显示--杨启辉
Signed-off-by: unknown <Administrator@.(none)>
Merge branch 'master' of git://github.com/oneman056/wms_rfid.git

Conflicts:
	code/Authority/THOK.Authority.Bll/Service/HelpContentService.cs
	code/Authority/Wms/Wms.csproj

Signed-off-by: Endis <369029432@qq.com>
帮助主页--杨启辉
Signed-off-by: unknown <Administrator@.(none)>
test
Signed-off-by: Endis <369029432@qq.com>
Finish Parse Text
dgfgsdfg
Merge branch 'master' of https://github.com/marc-kevin/Test.git

Conflicts:
	README.md
[feature/avatars] Let the server handle http or https for gravatars

PHPBB3-10018
calendars. something is broken for posting. need to get hack to work
Merge branch 'master' of https://github.com/markchua/skeddy
Added my swappable view test class
correct merge omission
products manuals and reviews load from s3 now
adding /cache/ dir
Misc
use 0x27. doc file must be encoded with latin-1.
Merge remote-tracking branch 'mattn/fix-doc-quotes' into dev

Conflicts:
	doc/ctrlp.txt
Update docs
Adjust a change in 5042a5d
Separate filename and path

Close #183
Update readme
Use @cd like :cd
Update docs
Extend '..' input
Paste from registers
Ver bump
Update docs
Fix #200
Open all files as hidden buffers
Minor doc update
Update docs
Disable autocmds when opening/closing
Use a custom pathshorten
Support standard parent dir syntax
Modify all activities. Add Tabhost and Tabwidgets
partial postorder w/rerooting; spr rewrites
adding gnupg plugin
Restructured the make item links function. Hope everything is right.
TEST COMMIT TUTORIAL
iOS certificate extraction: fix path to nimble
history uncompressed added too in order to be compressed with steal build
breyting: Minor alteration to readme.
- constructor injection working asynchronously
- bean lifecycle working
- constructor cycles tested
initial code-generation started
issue 3: fix overlooked CharClassify.startsNumber()

'+' can start a number now too, the error wasn't noticed since we
only call it from an assertion, and assertions are *disabled by
default* in Java and thus disabled by default even when running
unit tests in Eclipse.

(Maven, when run from the command line, *enables* assertions when
running unit tests, so this was a surprise.)
issue 4: keywords returned by the parser are now interned

Equal keywords returned by the same parser will be identical. Equal
keywords returned by two different parsers may not be identical.

That is, we implement keyword interning, within the scope of a single
Parser, not globally across all Parsers.
Make interning configurable for Keywords, Symbols and Strings.

By default Keywords are interned, Symbols are not interned, and
they empty String is interned. ParserConfigurationBuilder has
gained the ability to configure these behaviors.
Merge remote-tracking branch 'upstream/master'
(Failing) test case for interned keywords
Version 1

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Fix css link

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Imrove style

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Fix layout

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Add padding

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Tweak style

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Tweak style

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Moar styles

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Add margin

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Fix css link

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Change version

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Version 9

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Version 10

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
Version 11

Signed-off-by: Miki Leskinen <miki.leskinen@reaktor.fi>
bag changes
more tweeks to the map
add secure delegetion test setup to all backends
Use tabs instead of spaces in XML files edited with Vim.
Update readme repo file.
Read the extended desctription

Added an item that funcions as the 10K teleporter, commented out code
for the old noob nether ripoff portal, updated version 'cause V0.0A was
bugging me, minor changes and created some more folders for future
preperation.

Next up: Fix the infamous crash bug. :(
Add RSS support to the bmark views.

- Add routes, view and template
- Use dynamic route URLs in RSS template
- Add tests for parsing out the rss feed.
- Updates to the factory to prevent Tag issues
- Make sure we can parse it with a few important properties
- Add Alexandre Gravel-Raymond to the credits file
[Emulator] Updated default font
split files
rename client entry
refactor emitter
reduce object creation
unite user_id
wip
add png
Fix listing meta data.
move most of the root folders into tools/
Add the impress2md tool there too
added script to get memory usage
Quick white space adjustments
Closing branch issue 304

--HG--
branch : issue 304 : TestNG integration
extra : close : 1
typo doc => docs
Ensure reloading of embedded documents retain reference to the parent
Moving gpio_setup() / pin_setup() functions in separate projects to hackrf_core.h/c.
Moved enable_1v8_power() and release_cpld_jtag_pins() to hackrf_core.h/c.
Fixed Makefile breakage in blinky and blinky_rom_to_ram.
Removed release_cpld_jtag_pins() and incorporated code into pin_setup().
Makefile for all firmware projects.
TODO: There's still something broken about the *_rom_to_ram projects, but I'm not sure what it is yet...
USB performance test firmware project. It does absolutely nothing to start with, but at least the Makefile I just checked in won't blow up! :-)
Bitband library, factored out of other code.
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Merge branch 'master' of https://github.com/mossmann/hackrf
Changes to bit band API to make it more type-sane.
Exposing the delay() core function.
LDScript for RAM-only operation. (That's how I like to roll -- load RAM over SWD and execute.)
Makefile change to use RAM-only LDScript.
Hot steaming pile of in-progress USB test code. Eventually, this will morph into a proper stack. But first, to "make it work".
BalajiN | #0 | Integrating diagnostics with TAMA
Add preset width support and keymap for GitBlame
Merge pull request #24 from tksohishi/master

Add preset width support and keymap for GitBlame
XHR: Manually populate responseText and responseXML, when runtime is used.
add script to upload toolchain packages to releng infra
Merge branch 'master' into new-privacy-design

* master:
  Getting the real latest firefox version
  making the rest of the contribute pages content localizable
  Bug 765823 - Typo in About Partnerships page breadcrumb
  Fix to turn into a code example.
  migrate geolocation demo to google maps api v3
  Bug 762520 - [Apps] Add two new videos to apps partners page
  fix bug in l10n docs
  Correct path for manage.py command
  Fix tests after removal of product_details output
  Bug 744031 - meta descriptions are missing
  simplify product-details .gitignore
  Bug 760315 - Add Link to /Central Page
  [Bug 761700] Implement updated phone graphic on Devices page
  ignore product-details json
  add empty product_details_json folder
  remove product_details_json from git
  Added the same behavior for :focus as :hover
  update product-details
  update product-details
  Replace ordered-list nav with unordered (refs #144)
Merge branch 'new-privacy-design' into dev

* new-privacy-design:
fix unresolved conflict that got commited
Merge pull request #228 from ossreleasefeed/dev

fix unresolved conflict that got commited
Handle ; separated locations.
runtests icon for other result now a link to results.  added edit case link to runtests
Merge branch 'master' into pinned-filters
bug 751654 - make psycopg2 work for RHEL6 with postgres 9.0 RPM
Merge pull request #565 from rhelmer/master

bug 751654 - make psycopg2 work for RHEL6 with postgres 9.0 RPM
removed if statement from view fixes bug 789408
Merge pull request #821 from ossreleasefeed/mobeta-fixes-to-cadu-by-version-789408

removed if statement from view fixes bug 789408
provides a new /status/json endpoint

all the information available on the status page, exposed in an easily
machine consumable format
Merge pull request #809 from Lonnen/expose-status-json-mobeta

787951 - provides a new /status/json endpoint
more bottom padding on that bookmarklet button
set uses-flash checkbox in form initial state
"Submit a Review" tweaks: big stars and name (bug 763791, bug 764036)
and fix that pesky Webapp
fix DjangoUnicodeDecodeError in manifest viewer (bug 780823)
the other traceback fix (bug 783432)
make search results page more responsive - fix dangling orphans (bug 740663)
add in partial anonymisation (bug 758436)
Add random jitter to scheduler polling [#247]
Added backgrounds (none I like)
removed contactrequest controller & model
tests on user model
Add support for communication with the PC COMMS-LINK
  - This should help get the GDB-stub started as well as waiting for
    the new USB Cart which provides a better interface to communicate
    with the client (PC)
Change incorrect prototype from 'dram_init(void)' to 'dram_cartridge_init(void)'
switches callable check from rb_respond_to to rb_check_funcall as advised by nobu
* win32: don't use C99 variable length arrays for Visual Studio

refs #1496

g++ supports variable length arrays,
See http://gcc.gnu.org/onlinedocs/gcc/Variable-Length.html *1

VC++ currently does not support this feature.
See: http://msdn.microsoft.com/en-us/library/zb1574zs.aspx

For VC++, alloca function is suggested as replacement of VLA. *1
But alloca function is deprecated, _malloca is recommended to use.
See: http://msdn.microsoft.com/en-us/library/wb1s57t5%28v=vs.80%29.aspx
cmake: load version from file
32bit: use longlong for last_insert_grn_id()

Reported by Kazuhiko. Thanks!!!
Collect private members
Refactor to create _run_tests().
A test for errors during class_setup.
TXT File hinzugefügt
removed github button which causes critical error
remap keys for filco on macbook
Merge branch 'master' of github.com:mshade/dotfiles
added .gitignore
introduced distutils
added operations: write CPU memory, run CopyNES plugin
Added rubytest to bundles
adds zsh
little of interest happened
Merge branch 'master' of github.com:muchabi/Firefly
Merge branch 'master' of github.com:muchabi/Firefly
Slow down carousel.
Upload static files for dev and staging targets
Fix CDN path.
Merge branch 'prod'
Fix CDN path.
Doc

git-svn-id: http://libzdb.googlecode.com/svn/trunk@492 8a3d18e2-db48-0410-abc8-4378e866053e
StringBuffer_removeTrailingSemicolon  -> StringBuffer_trim

git-svn-id: http://libzdb.googlecode.com/svn/trunk@493 8a3d18e2-db48-0410-abc8-4378e866053e
MySQL: Improve error reporting for select and prepared statements


git-svn-id: http://libzdb.googlecode.com/svn/trunk@494 8a3d18e2-db48-0410-abc8-4378e866053e
Release 2.10.4

git-svn-id: http://libzdb.googlecode.com/svn/trunk@495 8a3d18e2-db48-0410-abc8-4378e866053e
Export StringSource in index.js
risk find
merged onoda riskDB
added NominalisationGen function
#237 added handling of custom types
Put back vital missing piece.
Move to example file, so can vary port number.
removed ls.scm
名古屋市での視聴可能チャンネル（地デジ）を設定
fixed importing pub_date
removed mount
voodoo to swap stylesheet colors based on userauth
Merge branch 'master' of github.com:nanotone/spoked
sort portraits by last ride time
test
Merge branch 'master' of github.com:nathamis/trekky
Corrected the strcpy at process.c:93
user feedback file updated
Added Scheduler and IdleEntityHider classes
Change default TextMate font
Include .hamlc files in JavaScript searches
fixed special types
adding Chapter 7 Exercise 4
massage edge so it can be imported into paper
Closes #350
Merge remote-tracking branch 'ndd/master' into patch-4
Fix for #333
Fixed error message to reflect usual message
Merge pull request #370 from shamanas/patch-4

Closes #333
Don't use full paths, lookup to avoid inserting N times.

I think FUSE gives us clean paths to work with anyway (relative paths
etc. are just an artifact of human interaction, but when requests go
through the VFS layer, they're being 'absolutized' already, which means
they're good to go for hashing.)

Also, make it a little less verbose.
Remove "Innovative Converged Devices" string from descriptor
Created ByteArray class to wrap byte[]

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Added symbol() method to HyperClientException.java

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Created ByteArray class to wrap byte[]

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Made java class, ByteArray, comparable

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Merging byte array strict code from master

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Reading of attribute name bytes no longer uses swig's automatic conversion to java String

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
dict_to_attrs() and dict_to_map_attrs() are now byte array strict

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Applied search bug fix from master branch

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
predicate_to_c() is now byte array strict

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
PUT_IF_NOT_EXIST
Refactoring for byte array sanity's sake

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Simplifying. No need to mangle. Just use Object type.

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Cleaning up exception reporting

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
java byte array strict code now compiles

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Examples are working

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Retrieved attribute names will arrive as java Strings

They will be formed by decoding the attribute names' bytes using the client's
current default string encoding.

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Had one too many next() calls string keyed maps

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Simplified the digestion of java sets and maps

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Merging in byte array friendly java bindings

Signed-off-by: Nick Tolomiczenko <nick.tolomiczenko@gmail.com>
Merge remote-tracking branch 'upstream/master'
When trimming image clips, don't try to preview them in viewer
Add default value for title_en in search indexes
Merge branch 'master' of github.com:nelson/Dotfiles
source/pcap: split into logical chunks
Fixed broken asciidoc syntax.
No Running ... Just for backup
ssd module initiation done

Add prep function for the request which takes over sd_prep_fn. This module builds on top of sd module, we should remove this dependency in the future.
coffee
finally, something
Hopefully fixed the replay desync disaster. I'm going to have nightmares about it. Needs more testing.
Lish_Array
Lish_IpUtil
Lish_ErrorHandler_Capture
Lish_SafeFunction
Use SystemUtils.getExternalDir().
Setting node name for publisher on the client side using both command line args and config
make caret for copy switching more visible
dont overwrite pbcopy in macs
quick/tiny xargs shortcut
Remove obsolete for loop
Seems like absolute_number sometimes return nil, use the table count to determine episodecount
Removed grouplayout.
ライセンス表示を追加 #23
Merge branch 'feature/license_#23' into develop
<bash> add prompt, add comments
Refactoring book preview template
Provided an origin port for rotate and scale transformations.
The origin point acts as a pivot around which the transformation happens.
added search box to users
Initialize stats classes
tp10 beginned
Fix CRLF, closes #374
Fix typo
Github -> GitHub (capitalization)
Merge pull request #434 from nomulous/patch-1

Github -> GitHub (capitalization)
Merge pull request #427 from joliss/typo

Fix typo
Merge pull request #376 from robertkowalski/clrf

Fix CRLF, closes #374
Don't display comments link for post excerpts on index page when comments for that post are set to false.
updated to latest version of Sass, fixed deprecation warnings
Fixed “3rd party plugins” wiki page link

Signed-off-by: Brandon Mathis <brandon@imathis.com>
Octopress filters are now limited to html producing templating languages, Fixes #536
Merge pull request #499 from lukekarrys/patch-1

Don't display comments link for post excerpts on index page when comments for that post are set to false
Updated Gemfile
updated plugins to work with latest version of Liquid
Merge branch 'master' of git://github.com/imathis/octopress
contrib: fix Neo1973 udev permission typo

Change-Id: I6d5ad0cc28e0cb52104ead9e974b8b1ed92d9cdc
Signed-off-by: Spencer Oliver <spen@spen-soft.co.uk>
Reviewed-on: http://openocd.zylin.com/636
Tested-by: jenkins
Reviewed-by: Peter Stuge <peter@stuge.se>
Removed the $nick from the response in loves
Merge pull request #2 from nucho/myFunction

Added Print class 
added print(char) and println(char)
Added SoftwareSerial class
Fix term
Add prefix `eve` to internal variables and internal placeholder selectors
Add `@if` directive for calculating `font-size`
Remove specifying modified date
Subdivide units
Ready to remove unit `line-height-normal`
Subdivide mixins
Subdivide functions
Version 2.6
Renaming CHANGELOG to CHANGELOG.rdoc
update #128
Add install information of OCaml with OPAM
Merge pull request #60 from cago/master

Add install instruction of OCaml with OPAM
Add README from the earlier repository.
Start off on some cache diagnostics. Shelve for the moment.
Merge branch 'master' of github.com:occupynet/sandy into http-caching
[location-cards] Shortcode / @with/@of and @using attributes -- allow alternate templates, and allow some more or less direct SQL query access.
FusionTables / Do a lil bit of error checking in the templates.
[location-cards] Shortcode / @with/@of bugfix -- use = for singleton arrays, allowing for ROWID queries. Google's sub-SQL dialect apparently can't handle sending ROWID through an IN operator?
Hive back out caching junk for development on a separate branch.
Merge pull request #4 from radgeek/master

shortcode enhancements
No longer use exceptions for pattern matching failures
Version .4, fixed cumulative
do not store automatic classification in database
New metric to capture the final resolution

OPEN - task 39: Add metrics to count changes to resolution and measure
final resolution type 
https://github.com/oerich/ReqtDisc/issues/issue/39
evaluation almost done
New metric to count changes to field 'resolution'

OPEN - task 39: Add metrics to count changes to resolution and measure
final resolution type 
https://github.com/oerich/ReqtDisc/issues/issue/39
Use the 'Resolution Changes' metric in the GUI

OPEN - task 39: Add metrics to count changes to resolution and measure
final resolution type 
https://github.com/oerich/ReqtDisc/issues/issue/39
New metric to capture the final resolution

OPEN - task 39: Add metrics to count changes to resolution and measure
final resolution type 
https://github.com/oerich/ReqtDisc/issues/issue/39
fixed #41
fixed #39
started to refactor metrics

FIXED - task 39: Add metrics to count changes to resolution and measure
final resolution type 
https://github.com/oerich/ReqtDisc/issues/issue/39
ccccc row added
Merge remote-tracking branch 'ogahamu/test_2' into ogahamu_test2
added files to add a feature
more fixed to the new features
trying to merge 01
added minified lib
Honouring http_no_proxy to complement http_proxy for apache httpcomponents client compatible libraries
merging in pitherjo\'s change
propagating non-proxy-hosts to sub processes too
making http.nonProxyHosts more optional
updated InvalidPhone's regular expression test to allow telephone numbers from sao paulo (ddd 11) to have 9 digits instead of only 8
Grrrr2
Readme revisions.
Added a few new tests to the Sprite spec.
updated docs index template
updated docs index template for ejs and links
updated docs template for ejs output
Split the update and draw functions.
CANVASENGINE-133 Layers can now be shown or hidden via the visibility property.
CANVASENGINE-136 - A layer's parent is now set when it is added to a scene.
CANVASENGINE-9 CANVASENGINE-60 CANVASENGINE-42 CANVASENGINE-10 Initial checkin for the new debug panel.
Updated README.md with correct path for visual tree
CANVASENGINE-42 Moved debug outline drawing from visual to the debug panel.
CANVASENGINE-10 Made all the added plugin hooks use the same captialization as the functions they are hooking into.
CANVASENGINE-10 Removing legacy files and code.
CANVASENGINE-10 Added a resize method to panel tabs so they will resize when you resize the panel.
CANVASENGINE-10 you can now see the stats on the performance tab.
CANVASENGINE-96 Moved events from sprite and layer to visual.
CANVASENGINE-107 Added "on" functions to visual objects and scenes.
CANVASENGINE-107 Changed the event tests to use the "on" function.
CANVASENGINE-117 Added a removeAsset function to asset bundles and the asset manager.
CANVASENGINE-132 Fixed the engine constructor documentation.
afs: Add some comments on GetValidDSlot panics

A couple of call sites for afs_GetValidDSlot currently panic if an
error is returned, but no explanation is given. Add a few comments
helping explain why there is a panic there, instead of graceful error
handling.

Change-Id: Ic1c9808c427fe7524ea7dc1b7dbab8e9ac665b91
Reviewed-on: http://gerrit.openafs.org/8407
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
Windows: AFSTearDownFcbExtents loop conditional

If there are extents in the list with a non-zero ActiveCount,
those extents will be skipped and the list 'le' will never
become empty.  Add an additional condition to ensure that the
loop is only executed once for each extent in the list.

Change-Id: I48adf7c49282181d0a34135ac50f7fa1a165c735
Reviewed-on: http://gerrit.openafs.org/7810
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
Tested-by: Jeffrey Altman <jaltman@your-file-system.com>
Windows: afslogon is only an authentication provider

afslogon.dll is just a Authentication Provider DLL.  It does not
provide network file system browse and mapping functions.  Therefore,
do not include the "ProviderPath" registry value when the
AuthentProviderPath variable is sufficient.

Reviewed-on: http://gerrit.openafs.org/7550
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
(cherry picked from commit d8397c7c320cd8557e4a24a9ff84b029c07b165e)

Change-Id: Ia968616663fe0f28f297e59266aff9d3688e0415
Reviewed-on: http://gerrit.openafs.org/7661
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@your-file-system.com>
rx: Make identity and opaque usable with NULL vals

Make it possible to have NULL values for elements of the rx_identity
and rx_opaque structures.

Change-Id: I3624d490d92da3cf75da5edb91c7d4e5ce1fa937
Reviewed-on: http://gerrit.openafs.org/7260
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Jeffrey Altman <jaltman@secure-endpoints.com>
Reviewed-by: Derrick Brashear <shadow@dementix.org>
ptserver: Avoid inet_ntoa

The ptserver uses inet_ntoa in a few places, such as for calculating
host CPS. This isn't safe in pthreaded environments, so use
afs_inet_ntoa_r instead.

Reviewed-on: http://gerrit.openafs.org/8287
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>
(cherry picked from commit 527f2ba00c1247ae7e8d6f355572c8635331bc0c)

Change-Id: I3740a294bd93b000842ccd791f2a11cef5092a9a
Reviewed-on: http://gerrit.openafs.org/8546
Reviewed-by: Ken Dreyer <ktdreyer@ktdreyer.com>
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>
Reviewed-by: Paul Smeddle <paul.smeddle@gmail.com>
Some cleaning up making it 'faster' to build tests (#57).
Minor update to the developer's documentation.
Addressing the testing of plugins (#87).
Fixed a couple of issues which got introduced as part of move to MSVC (#87). Can now run tests on Windows.
CSV: Removed unnecessary get()s and fixed header escapes
Use chef_db:create not create_fun
Fix copy/paste error with dashes and fonts
fixing a variable
Merge branch 'testing-ninja' into testing
call resetLayout in some specific actions in the oc-admin
minor changes in the modern theme
updated gui folder
updated i18n strings
minor fix in the date of the last checked of the plugins and themes updates
removed unnecessary files
Merge branch 'testing-ninja' into testing
updated references from 2.4.1 to 3.0
Merge branch 'testing-ninja' into testing
added testMarketDownload to oc-admin-appearance
Fix #415 fixes compact mode icons in all browsers
add retina compatibility
issue #417 preview button on themes market is not shown if there's no preview
Merge branch '417' into develop
Merge branch 'develop' of github.com:osclass/OSClass into testing
Merge branch 'testing' of github.com:osclass/OSClass into testing
Merge branch 'testing' into testing-ninja
fixed on contact/frontend
fixed login test
fixes in user test (frontend)
Merge branch 'testing-ninja' into testing
related to issue #565
Merge branch '565' into develop
add previous window
Do not build separate kernel extension for OS X 10.7 or 10.8

If Mac OS X SDK 10.6 is available, build the kernel extension for Mac OS X 10.6
and use this build on Mac OS X 10.6, 10.7 and 10.8. At this point the kernel
code for 10.6, 10.7 and 10.8 is effectively identical.
ASLTS: Remove a couple of incorrect tests.

Two tests found to be based on incorrect assumptions about ACPI and
ACPICA behavior. Chao Guan.
Disassembler: Add support to decode _PLD buffers.

Emit (in comments) the decoded contents of a static _PLD buffer
in order to improve comprehension of this bit-packed buffer.
Add struct header support for _FDE, _GRT, _GTM, and _SRT names.

Added structs for the buffers related to these predefined names,
in acbuffer.h
WL-2480 Support testing of hibernate related components.

Here we remove the hibernate ComponentManager calls.
First Commit of dlapi
Merge branch 'master' of github.com:pankajb64/dlapi
Put git config here and other changes.
Add RuntimeManager class for handling basic runtime flow.
- display hostname
Entered Greek text from SB 26.16662. lin9note--> corrected accent δίσση

 - Created from SoSOL template
 - Entered Greek text from SB 26.16662. lin9note--> corrected accent δίσση

Signed-off-by: Joshua D. Sosin <joshuad.sosin@gmail.com>
Signed-off-by: James Cowey <james.cowey@urz.uni-heidelberg.de>
Signed-off-by: Rodney Ast <simoeis@gmail.com>
Signed-off-by: Paul Heilporn <paul.heilporn@unistra.fr>
Signed-off-by: Thomas Kruse <thomas.kruse@oeaw.ac.at>
Signed-off-by: Cisca Hoogendijk <ciscahoogendijk@live.nl>
Signed-off-by: Graham Claytor <gclaytor@gmail.com>
Signed-off-by: Mark Depauw <mark.depauw@arts.kuleuven.be>
Signed-off-by: Lajos Berkes <berkes.lajos@googlemail.com>
Signed-off-by: Alain Delattre <adelattr@ulb.ac.be>
Signed-off-by: Jenny Cromwell <jenniferacromwell@gmail.com>
Signed-off-by: Tonia Sarri <toniasarri@gmail.com>
Signed-off-by: Matias Buchholz <matias.buchholz@helsinki.fi>
Signed-off-by: Christian-Jürgen Gruber <morunculus@gmail.com>
Signed-off-by: Hélène Cuvigny <h.cuvigny@gmail.com>
Signed-off-by: W. Graham Claytor <gclaytor@umich.edu>
Signed-off-by: Arthur Verhoogt <verhoogt@umich.edu>
Rename Text from 'papyri.info/ddbdp/sosol;2012;0035' (DDB_EpiDoc_XML/sosol/sosol.2012/sosol.2012.0035.xml) to 'papyri.info/ddbdp/sb;26;16662' (DDB_EpiDoc_XML/sb/sb.26/sb.26.16662.xml)
Update header to reflect new identifier 'papyri.info/ddbdp/sb;26;16662'
corrected according to Berkes and Cowey
Update revisionDesc

 - Vote - AcceptText - accept (Lajos Berkes)
 - Vote - AcceptText - lin1 [ca.4] .1 -> [ca.4].1; lin3 use correct apostrophe; lin13 .1 [ -> .1[ (James Cowey)
 - Finalized - Ready. (James Cowey)
Commented out unused parent template logic
Removed misleading/unused code in the deletion_changesets
added social share/plus buttons
intentionally break build to see failure service hook
Add a way to mark all posts as read. Move threaded index switch into settings.
Allow setting default post header size
Force htmlentities encoding
Trim extra whitespace off post subjects
Allow searching for posts directly from the url after the question mark.
Fix searching not working. Add search case insensitivity into settings.
Remove debug print
Show last visit time in settings.
Bump version. Enhance settings css.
removed sync import
Added tests for the shortcut.
holy fg
almost there
fixed fg,bg,etc. still need job ids and reentrant wrapper
[Nitehawk Interactive Games] Outcastia Campaign Setting - Book II (Player's Guidebook)
- Clean up directory, add legal.
Issue#: NEWSOURCE-131


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@17932 b6a209e6-650d-0410-972b-dadffa731f64
[Nitehawk Interactive Games] Outcastia Campaign Setting - Book II (Player's Guidebook)
- Clean up
Issue#: NEWSOURCE-131


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@17933 b6a209e6-650d-0410-972b-dadffa731f64
[Nitehawk Interactive Games] Creatures & Chaos: Adventurer's Handbook
- Clean up
Issue#: NEWSOURCE-66


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/content/notfordistribution@17934 b6a209e6-650d-0410-972b-dadffa731f64
Fix bug: CHOOSE:FEATSELETION has error
Issue#: CODE-1701


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@17561 b6a209e6-650d-0410-972b-dadffa731f64
Remove unused code

Issue#: CODE-1906


git-svn-id: svn+ssh://svn.code.sf.net/p/pcgen/code/Trunk/pcgen@18894 ef53c05b-3124-4d59-ae7d-fe3273f42be7
Fix Bug: Many errors in basic familiars (missing feats, extra vision capabilities, etc.)
Issue#: DATA-748


git-svn-id: https://pcgen.svn.sourceforge.net/svnroot/pcgen/Trunk/pcgen@18213 b6a209e6-650d-0410-972b-dadffa731f64
Remove dft_slidewindow
Progress towards fitting/subtracting variable freqs
Fit sinusoids with frequency defined by a polynomial.

Supports polynomial definition of amplitude everywhere but fitting.
Very hacky, but works on synthetic data with variable frequency
and constant phase. The observed data is not fitted well, which
probably indicates that the phase is unstable (which is obvious
in hindsight).

Next step will be modifying animated_window to track the phase
behavior, and include this in the fit.
Add a function for evaluating mean SNR over a run at different apertures
JdbcHandler almost complete
Also copy CSS and title banner
Request #19406: Allow to set individual attachment part headers
1.3 b3
Dialogo Personalizado en PR023
- index.js is now exporting client and server. before it only exports server
- fixed tests for remoteRequest and made the whole mechansim work with the app instances
bugfix: build system - remove duplicate include directories
bridges and white-gray-black dfs
Changed parameters of Move methods to Points instead of two ints, allow tileobject movement only to active tiles.
Add a function to remove merged branches from git repos.
Merge branch 'master' of github.com:peplin/dotfiles
Ignore build files from arduino.mk
Show all 4 CPUs if available.
Merge branch 'master' of github.com:peplin/dotfiles
Update some aesthetics in xmonad config.
Merge remote-tracking branch 'origin/master' into ford
Update and fix Eclim installation.
Merge branch 'master' into ford
Added Text::Table::List
test
Merge branch 'master' of github.com:pesome/shuihuar

Conflicts:
	readme.txt
complete index page
Merge branch 'master' of github.com:peterchou/koala
query test file
Added some POD
Merge branch 'master' of github.com:petermblair/ACL
edit employee general info and employment info
started work on implementing ignore.
fixes.
draft implementation for ignore command.
draft implementation for unignore command.
attempt at implementing settings window for ignores.
got the ignore settings page to play nice. need extra features in GUI kit.
added a tiny bit of error checking to unignore.
saving changes.
merging...
made unignore properly remove users from localStorage.
added support for text fields in forms... and box wrapping for such fields.
made the settings page display ignored users. need a way to edit through the UI, maybe.
cleanup.
got UI to hide messages received from ignored user.
saving changes.
cleanup. ignore functionality implemented. changed how log_item works and such.
merging in ignore.
changes reverted back to service
commons refactoring changes reappplied
Merge branch 'master' of https://github.com/phresco/phresco

Conflicts:
	commons/src/main/java/com/photon/phresco/util/EncryptString.java
	commons/src/main/java/com/photon/phresco/util/encryptString.java
	plugins/plugin-commons/src/main/java/com/photon/phresco/plugin/commons/EncryptString.java
Merge branch 'master' of https://github.com/phresco/phresco
iPhone unit test folder name with space issue fixed.
Correction to the molecule.pxd file to fix make error
Set correct paramters to constructors on tests
Added parameter for lazy loading
Use connection context manager if available
Fixed regression using instance (object) instead of class methods
Merge branch 'regression_lazy_loading__bisect' into regression_lazy_loading

Conflicts:
	antiorm/base.py
	tests/backends/_apsw.py
	tests/backends/generic.py
	tests/backends/mysql.py
	tests/backends/sqlite.py
Merge branch 'regression_lazy_loading'

Conflicts:
	antiorm/utils.py
	tests/backends/_apsw.py
	tests/backends/generic.py
	tests/backends/mysql.py
cli docs generator
initial version of cli docs
Remove stencil based drawing (from bkuker)
- fix issues with caching responses with "Vary" responses
- rel 3
Use aoData to represent the current state of REQUEST.items when retrieving datagrid values.
Merge pull request #189 from plomino/jean-aoData

Use aoData to represent the current state of REQUEST.items
Git : push explicite
sh: Avoid exporting unimplemented syscalls.

Now that userspace is making use of kernel-provided sanitized headers for
working out supported interfaces, we need to be a bit more diligent with
matching the syscall definitions with their actual wiring/support state.

In theory it shouldn't hurt anything since sys_ni_syscall will ultimately
do the right thing, but there's also not much need to lie about legacy
x86 syscalls that we've never supported.

This tightens things up a bit for uClibc at least.

Suggested-by: Carmelo Amoroso <carmelo.amoroso@st.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
sh: ecovec: switch SDHI controllers to card polling

Polling for card hotplug events is a better option than using SDHI native
hotplug interrupt, because the latter option forces the controller to stay
permanently powered up and enabled.

Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Fixed jambase dependency issue
Added first pieces of a utf8 string class
Fixed argument order in mem copy and added mem move function
changed production vars
005_Страница_Все_типы
Реализация минимального функционала.
Revert "いやっほい"

This reverts commit 4fe5de74c41cfe2178e73adb221969a46a248638.
reporters 格式修改
test branch commit2
merging test branch
Update Sat Dec 15 18:04:48 CET 2012
Moar whitespaec
Test for #1957


git-svn-id: http://svn.osgeo.org/postgis/branches/1.5@10250 b70326c6-7e19-0410-871a-916f4a2858ee
#1812 buildarea regress fails on mingw because polygons are different order.  Use st_equals for check instead

git-svn-id: http://svn.osgeo.org/postgis/branches/2.0@9833 b70326c6-7e19-0410-871a-916f4a2858ee
Прорешал до леревьев
Fix the ghost button on ICS
allow pml to render GA tag
fixed saving files based on assoication
MAde button a much more reasonable size
.
.
Fixing links?
URL path fixes; Doors import
Implemented new Stack datastructure
svn:399 correct skipping for stop forum spam client
add link to mailing list
update link to point to new mailing list
Readme typo fixes
Merge pull request #64 from matschaffer/master

Typos
reinstate auto-compile for windows
don't use poplin for nrepl-error as there's still some very weird and annoying bugs
update nrepl del
Merge branch 'master' of https://github.com/overtone/emacs-live
Made an example how to use SubForumView.
mayor changes to subforumview, almost done?
Merge branch 'master' of github.com:pum2pum/pum2pum
Lots of work on the MapStore/MapLoader functionality
Merge remote-tracking branch 'upstream/develop' into develop-db-oci8
Merge upstream branch
Merge remote-tracking branch 'upstream/develop' into develop-db-sqlite3
Merge remote-tracking branch 'upstream/develop' into develop-db-cubrid
Merge upstream branch
Merge remote-tracking branch 'upstream/develop' into develop-issue-128
Replace a preg_match() with stripos()
Fix issue #1039
Fix another issue
First iteration of interbase driver
Added public declarations
Various fixes
Restored '@' characters
Removed string case manipulation functions
Add improvements from @CUBRID's implementation
Minor codestyle fix
Syntax fixes
Limit clause fixes
Lowered the file permissions for file caches.

See #1045 for more information.

Signed-off-by: Yorick Peterse <yorickpeterse@gmail.com>
Implemented _list_columns() method
Provided a fallback for when there is no active module (such as on the Dashboard)
Allow admins to see profiler, not just localally.
Changed release version.
Updated phpdoc.
Update src/chapter1.txt

CCCC
moved helpers to applicationhelper
validate presence of :reply in comment
get rid of twitter button for now. getting errors from them in console
Updated HTML tag filtering
Re-organise files and add samples folder
modify socket io to accept socket client
[BUG #6223] Fixed translations for selected line strings. Thanks, Pierre.
[BUG #6178] need to name the image.json#common job more specifically

- so that the other image.json jobs find it when imported into config.json
- (ugly here!)
[BUG #6725] Renamed rest of the tutorials to 'tweets'.
Adde[BUG #6381] Started Refactoring of Navigation Page - Calculating right page size
bugfix @doc -> doc
comments working inside other forms and are shown mixed with user messages, container tabs menu on right-hand-side
Aufgabe 2 Fehler behoben
Changed fn order.
index 파일 생성

index 파일 생성

시작합니다.
[ACAD-1215] Change strategy for modifying placement padding and margin on the footer
Merge pull request #121 from croby/ACAD-1215

[ACAD-1215] Change strategy for modifying placement padding and margin on the footer
Updated unit tests to work with recent changes to the cf_wrapper code.
Troche dokumentacji, wszystkie pliki A* oraz U*, maly fix do podgladu uzytkownika
grant 2.0.7
grant 2.0.8
- Fixed warnings from r16835.
'cli'
from air
from air
from air
Delete bundle submodules
Vimrc à la vundle
No pathogen to be gitignored now
Gitignore bundles
Don't install pathogen from install.sh
Move vundle configuration to external source file

http://gmarik.info/blog/2011/05/17/chicken-or-egg-dilemma
Solve the chicken-or-egg dilemma

http://gmarik.info/blog/2011/05/17/chicken-or-egg-dilemma
Merge branch 'install-vundle'
addding new Log/Engine/ConsoleLog
new base class Log/Engine/BaseLog
selective logging by types
adding test for ConsoleLog engine
tests console logging from shells
changing Shell to use ConsoleLog
add default logging options for app and templates
Passing traffic reliably.
Allow misc commands over serial
Ethernet over usb in flash...
USB completion is callback driven
Run usb & eth out of interrupts
Finish off pins in symbols.
Fill in pinnumbers / labels.
Restore reporting unassigned functions.
Don't attempt to print unassigned pins.
ARJ14A-MBSD-E ethernet jack
Starting main sd
Updating the scripting layer stuff again. It seems I was actually downgrading before? Yay for out of date documentation.

Signed-off-by: Robert Deaton <rdeaton@udel.edu>
Code to show an image on the start screen.

Signed-off-by: Robert Deaton <rdeaton@udel.edu>
Make some contact info changes and proper links to releases.

Signed-off-by: Robert Deaton <rdeaton@udel.edu>
Fixed issues with the character getting stuck to surfaces while jumping again.
Remove useless chr calls in DNS parser
Replace calls to array_merge with array_values
Make Espresso\Stack work with invokables
[Http] Add support for HTTP/1.1 continue status codes

Some clients need this before they send their request body, in order to
avoid sending huge amounts of data needlessly
[Http] Add a test for Response::writeContinue()
[Http] Add tests for Request::expectsContinue()
Merge pull request #69 from react-php/useless-chr

Remove useless chr calls in DNS parser
Merge pull request #70 from react-php/stack-hotfix

Make Espresso\Stack work with invokables
Merge pull request #71 from react-php/http-continue

[Http] Add support for HTTP/1.1 continue status codes
Merge remote-tracking branch 'origin/master' into http-keepalive

* origin/master:
  [Http] Add tests for Request::expectsContinue()
  [Http] Add a test for Response::writeContinue()
  [Http] Add support for HTTP/1.1 continue status codes
  Make Espresso\Stack work with invokables
  Replace calls to array_merge with array_values
  Remove useless chr calls in DNS parser
Allow blocks to be downloaded from multiple nodes.
Add command line option -quietinitial.

This makes debugg.log quieter during block chain catch up, so that it is easier to see the block download process.

Yes, I know, potentially unnecessary with using third party log filtering tools, but not everynody uses these...
Make truncating the debug.log file an option.

Useful for developers who need to refer to futher back in debug.log history, but who don't want to
enable the -debug option and all the verbosity that comes with that.
Completed inverting templates. Hijacked internal links to use ajax.
Added collections and coloured menu levels
Added TopicConcept.
Public Keys in Progress, File Movements

Adds some commands for public keys (for ssh clients), and moves a few
files around (namely, moving the src/template/(cmds|models) folders to
src/template/src.  Also fixs a bug that would force the base_path to be
the current directory when using the `gitrs` executable.
Merged r9696 from trunk. Updates for 2.0.0 release.

git-svn-id: svn://rubyforge.org/var/svn/redmine/branches/2.0-stable@9697 e93f8b46-1217-0410-a6f0-8f06a7374b81
Adds a task to duplicate a string in locales.

git-svn-id: svn://rubyforge.org/var/svn/redmine/trunk@10080 e93f8b46-1217-0410-a6f0-8f06a7374b81
fixed  partioImport shelf icon,  was corrupted.
Edited Developer
Merge branch 'master' of github.com:reinerlim17/ASI
Add Mobile theme css
Add shake framework, for jquery
Add close button
Add mobile js for menu
Add viewport
Don't show mobile menu, when viewed by a desktop
Set specific height for map 
Remove arrow on close button
Set missing handler in view
Remove fixed height, was interfering with administrator menu
Added null check on value field.
Remove superflous whitespace
Ancestral Fortitude is (most likely) removed in MoP
Healing Wave is now resto only, use Healing Surge instead for SpellRange
Added Monk range check abilities for oUF_SpellRange
nCore: Print total money collected from mailbox.
Moved database creation to a place where it does not fail when working with PostgreSQL or MySQL; just after gem creation.
Add .aliasrc
modified templates meloch
razdel footer delet akcii and name and slogan
modified footer 1 vercy new footer
meloch
styled up the 404 error page
Add a bunch of useful aliases
Function to serve the current directory
SSH to a staging box
can use multiple algorithms
fix a bug
renamed distance function
diary entry
Merge branch 'master' of github.com:rlepigre/tin171
[revert] [refactor] that = this
commit 1a854e909633ba11f7b58baf71e5ef37062da6d3
[revert] [refactor] caching prototype
commit 42ccc7c76491d3d5110e21247f6e2a187bd976ce
fix double output due to html::output being called by a outside module, html::output is called automaticly when content type is html.
Ignore .pyc files
removed t.name from get_test_collection
Merge pull request #3 from rniwa/ignore_pyc

Ignore .pyc files
update
update
update
Merge branch 'master' of https://github.com/robbyl/softbill.git
Merge pull request #38 from robotoer/master

Added Left, Right, Full joins to Scrunch and added traits to reduce redundancy
testando ao vivo com o Guilherme
DataObjects/pman.ini
DataObjects/pman.links.ini
added COPYING and license headers to makefiles
SCM repositories part
Updated requirements.txt
Remove $wpdb->prepare() call to fix change introduced in WP3.5

prepare() now requires at least one variable to be substituted
Fix replacement of domains when pushing multisite subdirectory installs
Use DIRECTORY_SEPARATOR constant
Fix - don't do URL substitution when we are in admin
Do URL replacement on more content areas

Previously was just the_content. Now added wp_nav_menu, widget_text and any urls which are run through clean_url
Update version number & meta data
Merge release 0.4.1
Added new design to live site
Corrected errors in ThreadPool
Implemented ThreadPoolTest
use knitr:::opts_chunk_attr when available
always restore the files pane after build and reload
improved error reporting for knitr R parse errors
focus editor after switching file types
add line highlight for auto-navigated build errors
updating VERSION
Merge branch 'master' of github.com:rubyops/duality
Fix .index requirements. [admin]
write we command
basic player layout (again)
forgot CSS
Fixed permission bug where users would get assigned the role manor when accessing rota
Removing AR2 compat. DJ3 only clames to work with Rails 3+
testing Anthony

read above